[CAMEL-8948] Move aries.proxy before aries.blueprint bundles for correct ordering
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab845909 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab845909 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab845909 Branch: refs/heads/master Commit: ab845909b0daac83509eaf5c38aca3f774c73a5d Parents: 3db8438 Author: Grzegorz Grzybek <[email protected]> Authored: Fri Jul 17 21:20:10 2015 +0200 Committer: Grzegorz Grzybek <[email protected]> Committed: Mon Jul 20 14:51:37 2015 +0200 ---------------------------------------------------------------------- components/camel-test-blueprint/pom.xml | 20 ++++++++++---------- tests/camel-itest-osgi/pom.xml | 12 +++++++++++- 2 files changed, 21 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ab845909/components/camel-test-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml index 7588375..0da9002 100644 --- a/components/camel-test-blueprint/pom.xml +++ b/components/camel-test-blueprint/pom.xml @@ -58,6 +58,16 @@ <!-- the ordering of the dependencies can matter as we load the dependencies from the classpath with felix-connect, 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> @@ -75,16 +85,6 @@ <version>${aries-util-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.proxy</groupId> - <artifactId>org.apache.aries.proxy.api</artifactId> - <version>${aries-blueprint-proxy-version}</version> - </dependency> - <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.connect</artifactId> <version>${felix-connect-version}</version> http://git-wip-us.apache.org/repos/asf/camel/blob/ab845909/tests/camel-itest-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index db8c104..2ec17bb 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>
