This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag maven-launchpad-plugin-2.1.0 in repository https://gitbox.apache.org/repos/asf/sling-maven-launchpad-plugin.git
commit f23f3d6b6ada35da2bb1e28875bd2298304f8f62 Author: Carsten Ziegeler <[email protected]> AuthorDate: Mon Jul 4 06:54:47 2011 +0000 Code cleanup - remove unused stuff. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin@1142568 13f79535-47bb-0310-9956-ffa450edef68 --- .../projectsupport/AbstractBundleListMojo.java | 4 --- .../AbstractLaunchpadStartingMojo.java | 10 +++--- .../projectsupport/DisplayBundleUpdatesMojo.java | 42 +++++++--------------- .../projectsupport/bundlelist/BaseBundleList.java | 2 +- 4 files changed, 17 insertions(+), 41 deletions(-) diff --git a/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java index 1818ff6..2810c41 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java @@ -45,10 +45,6 @@ public abstract class AbstractBundleListMojo extends AbstractMojo { */ protected static final String PARTIAL = "partialbundlelist"; - protected static final String CONFIG_PATH_PREFIX = "resources/config"; - - protected static final String BUNDLE_PATH_PREFIX = "resources/bundles"; - protected static boolean shouldCopy(File source, File dest) { if (!dest.exists()) { return true; diff --git a/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java index 6835161..d1abf68 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java @@ -5,9 +5,9 @@ * licenses this file to You under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -16,12 +16,10 @@ */ package org.apache.sling.maven.projectsupport; -import static org.apache.felix.framework.util.FelixConstants.*; +import static org.apache.felix.framework.util.FelixConstants.LOG_LEVEL_PROP; import java.io.File; import java.io.FileFilter; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; @@ -83,7 +81,7 @@ public abstract class AbstractLaunchpadStartingMojo extends AbstractUsingBundleL /** * The definition of the package to be included to provide web support for * JAR-packaged projects (i.e. pax-web). - * + * * @parameter */ private ArtifactDefinition jarWebSupport; diff --git a/src/main/java/org/apache/sling/maven/projectsupport/DisplayBundleUpdatesMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/DisplayBundleUpdatesMojo.java index aa34a78..2b9868f 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/DisplayBundleUpdatesMojo.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/DisplayBundleUpdatesMojo.java @@ -5,9 +5,9 @@ * licenses this file to You under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -35,7 +35,6 @@ import org.apache.maven.model.Dependency; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.path.PathTranslator; import org.apache.maven.settings.Settings; import org.apache.sling.maven.projectsupport.bundlelist.v1_0_0.Bundle; @@ -52,10 +51,10 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException; /** * Displays all bundles that have newer versions available. Highly based upon the * display-dependency-updates goal from the Versions plugin. - * + * * @since 2.0.8 * @goal display-bundle-updates - * + * */ public class DisplayBundleUpdatesMojo extends AbstractMojo { @@ -70,25 +69,8 @@ public class DisplayBundleUpdatesMojo extends AbstractMojo { private org.apache.maven.artifact.factory.ArtifactFactory artifactFactory; /** - * @component - */ - private org.apache.maven.artifact.resolver.ArtifactResolver resolver; - - /** - * @component - */ - private MavenProjectBuilder projectBuilder; - - /** - * @parameter expression="${reactorProjects}" - * @required - * @readonly - */ - private List reactorProjects; - - /** * The artifact metadata source to use. - * + * * @component * @required * @readonly @@ -127,7 +109,7 @@ public class DisplayBundleUpdatesMojo extends AbstractMojo { /** * settings.xml's server id for the URL. This is used when wagon needs extra * authentication information. - * + * * @parameter expression="${maven.version.rules.serverId}" * default-value="serverId"; */ @@ -136,14 +118,14 @@ public class DisplayBundleUpdatesMojo extends AbstractMojo { /** * The Wagon URI of a ruleSet file containing the rules that control how to * compare version numbers. - * + * * @parameter expression="${maven.version.rules}" */ private String rulesUri; /** * The Maven Session. - * + * * @parameter expression="${session}" * @required * @readonly @@ -163,7 +145,7 @@ public class DisplayBundleUpdatesMojo extends AbstractMojo { /** * Whether to allow snapshots when searching for the latest version of an * artifact. - * + * * @parameter expression="${allowSnapshots}" default-value="false" */ private boolean allowSnapshots; @@ -177,9 +159,9 @@ public class DisplayBundleUpdatesMojo extends AbstractMojo { public void execute() throws MojoExecutionException, MojoFailureException { try { BundleList bundleList = readBundleList(bundleListFile); - + Set<Dependency> bundlesAsDependencies = new HashSet<Dependency>(); - + for (StartLevel startLevel : bundleList.getStartLevels()) { for (Bundle bundle : startLevel.getBundles()) { bundlesAsDependencies.add(asDependency(bundle)); @@ -200,7 +182,7 @@ public class DisplayBundleUpdatesMojo extends AbstractMojo { dep.setClassifier(bundle.getClassifier()); dep.setVersion(bundle.getVersion()); dep.setType(bundle.getType()); - + return dep; } diff --git a/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java b/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java index 5bfc19f..2079203 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java @@ -48,7 +48,7 @@ public abstract class BaseBundleList { /** * Merge the current bundle list with an additional list. - * @see add(Bundle) + * @see #add(Bundle) * * @param bundleList the new bundle list */ -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
