Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9E42B175C7 for ; Thu, 6 Nov 2014 22:48:18 +0000 (UTC) Received: (qmail 85482 invoked by uid 500); 6 Nov 2014 22:48:18 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 85422 invoked by uid 500); 6 Nov 2014 22:48:18 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 85413 invoked by uid 99); 6 Nov 2014 22:48:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2014 22:48:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2014 22:47:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3CA36238899C; Thu, 6 Nov 2014 22:47:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1637253 - in /sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport: BundleInstallFileMojo.java GenerateAdapterMetadataMojo.java Date: Thu, 06 Nov 2014 22:47:54 -0000 To: commits@sling.apache.org From: sseifert@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141106224754.3CA36238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sseifert Date: Thu Nov 6 22:47:53 2014 New Revision: 1637253 URL: http://svn.apache.org/r1637253 Log: cosmetic code cleanup - remove some unused imports and a unused variable Modified: sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java Modified: sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java?rev=1637253&r1=1637252&r2=1637253&view=diff ============================================================================== --- sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java (original) +++ sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java Thu Nov 6 22:47:53 2014 @@ -22,7 +22,6 @@ import java.util.List; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; -import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; @@ -30,7 +29,6 @@ import org.apache.maven.artifact.reposit import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import org.codehaus.plexus.util.StringUtils; /** Modified: sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java?rev=1637253&r1=1637252&r2=1637253&view=diff ============================================================================== --- sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java (original) +++ sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java Thu Nov 6 22:47:53 2014 @@ -16,7 +16,9 @@ */ package org.apache.sling.maven.bundlesupport; -import static org.objectweb.asm.ClassReader.*; +import static org.objectweb.asm.ClassReader.SKIP_CODE; +import static org.objectweb.asm.ClassReader.SKIP_DEBUG; +import static org.objectweb.asm.ClassReader.SKIP_FRAMES; import java.io.File; import java.io.FileInputStream; @@ -35,7 +37,6 @@ import org.apache.maven.plugin.MojoFailu import org.apache.maven.project.MavenProject; import org.apache.sling.adapter.annotations.Adaptable; import org.apache.sling.adapter.annotations.Adaptables; -import org.apache.sling.commons.json.JSONArray; import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.JSONObject; import org.codehaus.plexus.util.IOUtil; @@ -209,7 +210,6 @@ public class GenerateAdapterMetadataMojo final JSONObject descriptor) throws JSONException { String adaptableClassName = null; List adapters = null; - String servicePid = null; final List values = annotation.values;