This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag maven-launchpad-plugin-2.1.2 in repository https://gitbox.apache.org/repos/asf/sling-maven-launchpad-plugin.git
commit 6a0e12abbbabc9ebff09e0b02fa6aa2b8c4448f1 Author: Justin Edelson <[email protected]> AuthorDate: Fri Oct 7 19:14:15 2011 +0000 SLING-2241 - AbstractLaunchpadStartingMojo uses protected fields from parent class git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin@1180166 13f79535-47bb-0310-9956-ffa450edef68 --- .../projectsupport/AbstractLaunchpadStartingMojo.java | 14 -------------- .../maven/projectsupport/AbstractUsingBundleListMojo.java | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) 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 9da0201..2cf52d5 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java @@ -36,9 +36,7 @@ import java.util.Set; import org.apache.felix.framework.Logger; import org.apache.maven.artifact.Artifact; -import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.shared.filtering.MavenFileFilter; import org.apache.maven.shared.filtering.MavenFilteringException; import org.apache.maven.shared.filtering.PropertyUtils; import org.apache.sling.launchpad.api.LaunchpadContentProvider; @@ -105,18 +103,6 @@ public abstract class AbstractLaunchpadStartingMojo extends AbstractUsingBundleL */ private File resourceProviderRoot; - /** - * @component - */ - private MavenFileFilter mavenFileFilter; - - /** - * @parameter expression="${session}" - * @required - * @readonly - */ - private MavenSession mavenSession; - private LaunchpadContentProvider resourceProvider = new LaunchpadContentProvider() { public Iterator<String> getChildren(String path) { diff --git a/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java index 75bceb5..b6fc886 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java @@ -175,7 +175,7 @@ public abstract class AbstractUsingBundleListMojo extends AbstractBundleListMojo /** * @component */ - private MavenFileFilter mavenFileFilter; + protected MavenFileFilter mavenFileFilter; /** * The zip unarchiver. -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
