You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gg...@apache.org on 2015/07/21 11:24:03 UTC
[05/13] camel git commit: [CAMEL-8948] Move aries.proxy before
aries.blueprint bundles for correct ordering
[CAMEL-8948] Move aries.proxy before aries.blueprint bundles for correct ordering
(cherry picked from commit ab845909b0daac83509eaf5c38aca3f774c73a5d)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/140b0f91
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/140b0f91
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/140b0f91
Branch: refs/heads/camel-2.15.x
Commit: 140b0f9102e3888ad187b1e2690bd9f0f064f3e5
Parents: 474c69d
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Fri Jul 17 21:20:10 2015 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Tue Jul 21 09:44:16 2015 +0200
----------------------------------------------------------------------
components/camel-test-blueprint/pom.xml | 10 ++++++++++
tests/camel-itest-osgi/pom.xml | 12 +++++++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/140b0f91/components/camel-test-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index f6b43c5..af5323f 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -64,6 +64,16 @@
<!-- the ordering of the dependencies can matter as we load the dependencies from the classpath
with pojosr, and you may get a weird error if wrong order -->
<dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>${aries-blueprint-proxy-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <version>${aries-blueprint-proxy-impl-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/140b0f91/tests/camel-itest-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index 7671768..a74b2e7 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -43,7 +43,17 @@
<!-- blueprint -->
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.cm</artifactId>
<scope>test</scope>
</dependency>