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 18:58:28 UTC
tomee git commit: TOMEE-1742 fixing application composer plugins
Repository: tomee
Updated Branches:
refs/heads/master 4b9d8c9d2 -> 1b078ccc3
TOMEE-1742 fixing application composer plugins
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1b078ccc
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1b078ccc
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1b078ccc
Branch: refs/heads/master
Commit: 1b078ccc3bcf010cd984e29a6472c1514add1514
Parents: 4b9d8c9
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Fri Mar 18 18:58:03 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Fri Mar 18 18:58:03 2016 +0100
----------------------------------------------------------------------
.../mojo/ApplicationComposerRunMojo.java | 21 +++++++++++++++++++-
.../mojo/ApplicationComposerZipMojo.java | 3 ++-
2 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/1b078ccc/maven/applicationcomposer-maven-plugin/src/main/java/org/apache/openejb/applicationcomposer/mojo/ApplicationComposerRunMojo.java
----------------------------------------------------------------------
diff --git a/maven/applicationcomposer-maven-plugin/src/main/java/org/apache/openejb/applicationcomposer/mojo/ApplicationComposerRunMojo.java b/maven/applicationcomposer-maven-plugin/src/main/java/org/apache/openejb/applicationcomposer/mojo/ApplicationComposerRunMojo.java
index 5d18770..306a9c0 100644
--- a/maven/applicationcomposer-maven-plugin/src/main/java/org/apache/openejb/applicationcomposer/mojo/ApplicationComposerRunMojo.java
+++ b/maven/applicationcomposer-maven-plugin/src/main/java/org/apache/openejb/applicationcomposer/mojo/ApplicationComposerRunMojo.java
@@ -21,6 +21,7 @@ import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.openejb.core.ParentClassLoaderFinder;
import org.apache.openejb.testing.ApplicationComposers;
@@ -28,15 +29,25 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
-@Mojo(name = "run")
+import static java.util.Arrays.asList;
+
+@Mojo(name = "run", requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
public class ApplicationComposerRunMojo extends ApplicationComposerMojo {
@Parameter
private String[] args;
+ @Parameter
+ private String[] acceptScopes;
+
+ @Parameter
+ private String[] excludedArtifacts;
+
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
if (application == null) {
@@ -75,7 +86,15 @@ public class ApplicationComposerRunMojo extends ApplicationComposerMojo {
private Collection<URL> findDeps() {
final List<URL> urls = new ArrayList<>();
+ final Collection<String> passingScoped = acceptScopes == null ? asList("compile", "runtime") : asList(acceptScopes);
+ final Collection<String> excludedAnyway = excludedArtifacts == null ? Collections.<String>emptyList() : asList(excludedArtifacts);
for (final Artifact artifact : (Set<Artifact>) project.getArtifacts()) {
+ if (!passingScoped.contains(artifact.getScope())) {
+ continue;
+ }
+ if (excludedAnyway.contains(artifact.getGroupId() + ":" + artifact.getArtifactId())) {
+ continue;
+ }
try {
urls.add(artifact.getFile().toURI().toURL());
} catch (final MalformedURLException e) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/1b078ccc/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 f461dac..e7c8282 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
@@ -22,6 +22,7 @@ import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.openejb.loader.Files;
import org.apache.openejb.loader.IO;
@@ -40,7 +41,7 @@ import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
-@Mojo(name = "zip")
+@Mojo(name = "zip", requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
public class ApplicationComposerZipMojo extends ApplicationComposerMojo {
@Parameter(defaultValue = "${project.build.directory}/${project.build.finalName}-applicationcomposer")
protected File workDir;