You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/11/13 15:58:32 UTC
[1/2] camel git commit: CAMEL-9321: Blueprint example and archetype
does not work when executed with camel:run
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 15ec21887 -> e6a6ef86f
refs/heads/master 13c0a110e -> 6ff0d39e7
CAMEL-9321: Blueprint example and archetype does not work when executed with camel:run
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6ff0d39e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6ff0d39e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6ff0d39e
Branch: refs/heads/master
Commit: 6ff0d39e76282047ec8e772352b5c38d792fde78
Parents: 13c0a11
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Fri Nov 13 15:53:35 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Nov 13 16:01:26 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/maven/RunMojo.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6ff0d39e/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 dcf39e1..a3b3b46 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
@@ -747,13 +747,6 @@ public class RunMojo extends AbstractExecMojo {
Set<Artifact> deps = resolveExecutableDependencies(artifact, true);
if (deps != null) {
for (Artifact dep : deps) {
-
- // we must skip org.apache.aries.blueprint.core:, otherwise we get duplicate blueprint extenders
- if (dep.getArtifactId().equals("org.apache.aries.blueprint.core")) {
- getLog().debug("Skipping org.apache.aries.blueprint.core -> " + dep.getGroupId() + "/" + dep.getArtifactId() + "/" + dep.getVersion());
- continue;
- }
-
// we skip test scoped
if ("test".equals(dep.getScope())) {
getLog().debug("Skipping test scoped -> " + dep.getGroupId() + "/" + dep.getArtifactId() + "/" + dep.getVersion());
[2/2] camel git commit: CAMEL-9321: Blueprint example and archetype
does not work when executed with camel:run
Posted by da...@apache.org.
CAMEL-9321: Blueprint example and archetype does not work when executed with camel:run
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e6a6ef86
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e6a6ef86
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e6a6ef86
Branch: refs/heads/camel-2.16.x
Commit: e6a6ef86fa6fb577bfd8e288d1b62ce05c9f09a6
Parents: 15ec218
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Fri Nov 13 15:53:35 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Nov 13 16:02:03 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/maven/RunMojo.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e6a6ef86/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 dcf39e1..a3b3b46 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
@@ -747,13 +747,6 @@ public class RunMojo extends AbstractExecMojo {
Set<Artifact> deps = resolveExecutableDependencies(artifact, true);
if (deps != null) {
for (Artifact dep : deps) {
-
- // we must skip org.apache.aries.blueprint.core:, otherwise we get duplicate blueprint extenders
- if (dep.getArtifactId().equals("org.apache.aries.blueprint.core")) {
- getLog().debug("Skipping org.apache.aries.blueprint.core -> " + dep.getGroupId() + "/" + dep.getArtifactId() + "/" + dep.getVersion());
- continue;
- }
-
// we skip test scoped
if ("test".equals(dep.getScope())) {
getLog().debug("Skipping test scoped -> " + dep.getGroupId() + "/" + dep.getArtifactId() + "/" + dep.getVersion());