You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/03/18 19:00:45 UTC
tomee git commit: TOMEE-1742 fixing application composer plugins -
exclusion list for zip goal
Repository: tomee
Updated Branches:
refs/heads/master 1b078ccc3 -> 01ba71b2e
TOMEE-1742 fixing application composer plugins - exclusion list for zip goal
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/01ba71b2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/01ba71b2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/01ba71b2
Branch: refs/heads/master
Commit: 01ba71b2ee8f540a996e8fb8c503c3f371692efc
Parents: 1b078cc
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Fri Mar 18 19:00:32 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Fri Mar 18 19:00:32 2016 +0100
----------------------------------------------------------------------
.../mojo/ApplicationComposerZipMojo.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/01ba71b2/maven/applicationcomposer-maven-plugin/src/main/java/org/apache/openejb/applicationcomposer/mojo/ApplicationComposerZipMojo.java
----------------------------------------------------------------------
diff --git a/maven/applicationcomposer-maven-plugin/src/main/java/org/apache/openejb/applicationcomposer/mojo/ApplicationComposerZipMojo.java b/maven/applicationcomposer-maven-plugin/src/main/java/org/apache/openejb/applicationcomposer/mojo/ApplicationComposerZipMojo.java
index e7c8282..4f7c020 100644
--- a/maven/applicationcomposer-maven-plugin/src/main/java/org/apache/openejb/applicationcomposer/mojo/ApplicationComposerZipMojo.java
+++ b/maven/applicationcomposer-maven-plugin/src/main/java/org/apache/openejb/applicationcomposer/mojo/ApplicationComposerZipMojo.java
@@ -37,10 +37,14 @@ import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
+import static java.util.Arrays.asList;
+
@Mojo(name = "zip", requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
public class ApplicationComposerZipMojo extends ApplicationComposerMojo {
@Parameter(defaultValue = "${project.build.directory}/${project.build.finalName}-applicationcomposer")
@@ -61,6 +65,9 @@ public class ApplicationComposerZipMojo extends ApplicationComposerMojo {
@Parameter
protected String classifier;
+ @Parameter
+ private String[] excludedArtifacts;
+
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
if (application == null) {
@@ -91,7 +98,11 @@ public class ApplicationComposerZipMojo extends ApplicationComposerMojo {
}
// app deps
+ final Collection<String> excludedAnyway = excludedArtifacts == null ? Collections.<String>emptyList() : asList(excludedArtifacts);
for (final Artifact artifact : (Set<Artifact>) project.getArtifacts()) {
+ if (excludedAnyway.contains(artifact.getGroupId() + ":" + artifact.getArtifactId())) {
+ continue;
+ }
final File file = artifact.getFile();
try {
final File to = new File(lib, file.getName());