You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:15:51 UTC
[sling-maven-launchpad-plugin] 14/34: Remove unused code
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 2fc71ae125efa7fe9ae27c34c4d92eff797dcb40
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jul 11 09:38:24 2011 +0000
Remove unused code
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin@1145094 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/projectsupport/PreparePackageMojo.java | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java
index bc8a9e3..9f445f3 100644
--- a/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java
+++ b/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java
@@ -28,9 +28,7 @@ import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.components.io.fileselectors.IncludeExcludeFileSelector;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
/**
* Initialize a Sling application project by extracting bundles into the correct
@@ -184,7 +182,7 @@ public class PreparePackageMojo extends AbstractLaunchpadFrameworkMojo {
"Project doesn't have a base dependency of groupId %s and artifactId %s",
base.getGroupId(), base.getArtifactId()));
}
- unpack(artifact.getFile(), buildOutputDirectory, null, null);
+ unpack(artifact.getFile(), buildOutputDirectory);
}
private void copyConfigurationFiles() throws MojoExecutionException {
@@ -196,7 +194,7 @@ public class PreparePackageMojo extends AbstractLaunchpadFrameworkMojo {
}
- private void unpack(File source, File destination, String includes, String excludes)
+ private void unpack(File source, File destination)
throws MojoExecutionException {
getLog().info("Unpacking " + source.getPath() + " to\n " + destination.getPath());
try {
@@ -207,20 +205,6 @@ public class PreparePackageMojo extends AbstractLaunchpadFrameworkMojo {
unArchiver.setSourceFile(source);
unArchiver.setDestDirectory(destination);
- if (StringUtils.isNotEmpty(excludes) || StringUtils.isNotEmpty(includes)) {
- IncludeExcludeFileSelector[] selectors = new IncludeExcludeFileSelector[] { new IncludeExcludeFileSelector() };
-
- if (StringUtils.isNotEmpty(excludes)) {
- selectors[0].setExcludes(excludes.split(","));
- }
-
- if (StringUtils.isNotEmpty(includes)) {
- selectors[0].setIncludes(includes.split(","));
- }
-
- unArchiver.setFileSelectors(selectors);
- }
-
unArchiver.extract();
} catch (NoSuchArchiverException e) {
throw new MojoExecutionException("Unable to find archiver for " + source.getPath(), e);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.