Repository: camel Updated Branches: refs/heads/camel-2.16.x b3bd4cd81 -> 910b517fc refs/heads/master 6e3210913 -> 532675832
Better resolution of CDI / Blueprint and plugin transitive dependencies Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/53267583 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/53267583 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/53267583 Branch: refs/heads/master Commit: 5326758326692c6a685d7b7bad28a22ff428d97b Parents: 6e32109 Author: Antonin Stefanutti <anto...@stefanutti.fr> Authored: Fri Nov 13 15:03:04 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Nov 13 17:42:15 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/camel/maven/RunMojo.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/53267583/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java index a3b3b46..9b6c064 100644 --- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java +++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java @@ -34,6 +34,7 @@ import java.util.Set; import org.apache.camel.util.CastUtils; import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -41,6 +42,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionResult; import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter; +import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.model.Dependency; @@ -747,16 +749,6 @@ public class RunMojo extends AbstractExecMojo { Set<Artifact> deps = resolveExecutableDependencies(artifact, true); if (deps != null) { for (Artifact dep : deps) { - // we skip test scoped - if ("test".equals(dep.getScope())) { - getLog().debug("Skipping test scoped -> " + dep.getGroupId() + "/" + dep.getArtifactId() + "/" + dep.getVersion()); - continue; - } - if ("provided".equals(dep.getScope())) { - getLog().debug("Skipping provided scoped -> " + dep.getGroupId() + "/" + dep.getArtifactId() + "/" + dep.getVersion()); - continue; - } - getLog().debug("Adding extra plugin dependency artifact: " + dep.getArtifactId() + " to classpath"); path.add(dep.getFile().toURI().toURL()); @@ -959,14 +951,13 @@ public class RunMojo extends AbstractExecMojo { // not forgetting the Artifact of the project itself dependencyArtifacts.add(executableProject.getArtifact()); - // resolve all dependencies transitively to obtain a comprehensive - // list of assemblies + // resolve runtime dependencies transitively to obtain a comprehensive list of assemblies ArtifactResolutionResult result = artifactResolver.resolveTransitively(dependencyArtifacts, executablePomArtifact, Collections.emptyMap(), this.localRepository, this.remoteRepositories, - metadataSource, null, + metadataSource, new ScopeArtifactFilter(DefaultArtifact.SCOPE_RUNTIME), Collections.emptyList()); executableDependencies = CastUtils.cast(result.getArtifacts());
