[CAMEL-8948] Replace old aggregate Aries BP bundle with correct bundles (api, core, cm)
(cherry picked from commit c52c9196afe80f333f2be384463466c7ddf2272f) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/118b605a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/118b605a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/118b605a Branch: refs/heads/camel-2.15.x Commit: 118b605a9d30f4da055e1f19df93f68839eac71a Parents: 6570005 Author: Grzegorz Grzybek <gr.grzy...@gmail.com> Authored: Fri Jul 10 15:02:37 2015 +0200 Committer: Grzegorz Grzybek <gr.grzy...@gmail.com> Committed: Tue Jul 21 09:43:28 2015 +0200 ---------------------------------------------------------------------- components/camel-cxf/pom.xml | 2 +- components/camel-test-blueprint/pom.xml | 11 +++++++++-- parent/pom.xml | 18 ++++++++++++------ platforms/karaf/features/pom.xml | 7 ++++++- 4 files changed, 28 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/118b605a/components/camel-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index 7bb599a..d3bd296 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -146,7 +146,7 @@ </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint</artifactId> + <artifactId>org.apache.aries.blueprint.core</artifactId> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/118b605a/components/camel-test-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml index 4674ae6..f6b43c5 100644 --- a/components/camel-test-blueprint/pom.xml +++ b/components/camel-test-blueprint/pom.xml @@ -63,10 +63,17 @@ <!-- 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 --> - <!-- yes this is correct to use aries.blueprint as dependency (as it has all the pieces needed by pojosr) and use the core-version --> <dependency> <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint</artifactId> + <artifactId>org.apache.aries.blueprint.api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.cm</artifactId> </dependency> <dependency> <groupId>org.apache.aries</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/118b605a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f43c900..cf19b88 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -44,10 +44,11 @@ <apacheds-version>2.0.0-M19</apacheds-version> <apache-gora-version>0.4</apache-gora-version> <apache-mime4j-version>0.7.2</apache-mime4j-version> - <aries-blueprint-api-version>1.0.0</aries-blueprint-api-version> - <aries-blueprint-core-version>1.1.0</aries-blueprint-core-version> - <aries-blueprint-proxy-version>1.0.0</aries-blueprint-proxy-version> - <aries-blueprint-proxy-impl-version>1.0.1</aries-blueprint-proxy-impl-version> + <aries-blueprint-api-version>1.0.1</aries-blueprint-api-version> + <aries-blueprint-cm-version>1.0.6</aries-blueprint-cm-version> + <aries-blueprint-core-version>1.4.3</aries-blueprint-core-version> + <aries-blueprint-proxy-version>1.0.1</aries-blueprint-proxy-version> + <aries-blueprint-proxy-impl-version>1.0.4</aries-blueprint-proxy-impl-version> <aries-util-version>1.1.0</aries-util-version> <arquillian-junit-container-version>1.0.0.CR7</arquillian-junit-container-version> <arquillian-weld-ee-embedded-version>1.0.0.CR3</arquillian-weld-ee-embedded-version> @@ -2560,14 +2561,19 @@ <!-- blueprint --> <dependency> <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint</artifactId> - <version>${aries-blueprint-core-version}</version> + <artifactId>org.apache.aries.blueprint.api</artifactId> + <version>${aries-blueprint-api-version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.core</artifactId> <version>${aries-blueprint-core-version}</version> </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.cm</artifactId> + <version>${aries-blueprint-cm-version}</version> + </dependency> <!-- OSGi ConfigAdmin service --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/118b605a/platforms/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml index bffab4c..0fc7102 100644 --- a/platforms/karaf/features/pom.xml +++ b/platforms/karaf/features/pom.xml @@ -66,7 +66,12 @@ </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint</artifactId> + <artifactId>org.apache.aries.blueprint.api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.core</artifactId> <scope>provided</scope> </dependency> <dependency>
