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 2013/03/04 15:08:20 UTC
svn commit: r1452315 - in /camel/trunk: components/camel-blueprint/pom.xml
components/camel-cxf-transport/pom.xml components/camel-cxf/pom.xml
components/camel-test-blueprint/pom.xml parent/pom.xml
platforms/karaf/features/pom.xml
Author: davsclaus
Date: Mon Mar 4 14:08:20 2013
New Revision: 1452315
URL: http://svn.apache.org/r1452315
Log:
CAMEL-6112: Align Aries Blueprint used in Camel to same version as of Karaf 2.3.1 to be in sync
Modified:
camel/trunk/components/camel-blueprint/pom.xml
camel/trunk/components/camel-cxf-transport/pom.xml
camel/trunk/components/camel-cxf/pom.xml
camel/trunk/components/camel-test-blueprint/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
Modified: camel/trunk/components/camel-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1452315&r1=1452314&r2=1452315&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Mon Mar 4 14:08:20 2013
@@ -76,6 +76,11 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>${aries-util-version}</version>
+ </dependency>
<!-- for testing -->
<dependency>
Modified: camel/trunk/components/camel-cxf-transport/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/pom.xml?rev=1452315&r1=1452314&r2=1452315&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/pom.xml (original)
+++ camel/trunk/components/camel-cxf-transport/pom.xml Mon Mar 4 14:08:20 2013
@@ -96,7 +96,8 @@
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>${aries-blueprint-core-version}</version>
</dependency>
<!-- for testing -->
Modified: camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1452315&r1=1452314&r2=1452315&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Mon Mar 4 14:08:20 2013
@@ -52,9 +52,9 @@
org.osgi.service.blueprint;resolution:=optional,
org.osgi.service.blueprint.container;resolution:=optional,
org.osgi.service.blueprint.reflect;resolution:=optional,
- org.apache.aries.blueprint;version="[0.3,2.0)";resolution:=optional,
- org.apache.aries.blueprint.reflect;version="[0.3,2.0)";resolution:=optional,
- org.apache.aries.blueprint.mutable;version="[0.3,2.0)";resolution:=optional,
+ org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
+ org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
+ org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
org.apache.camel.blueprint;resolution:=optional,
org.osgi.framework;resolution:=optional,
*
@@ -139,6 +139,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
+ <version>${aries-blueprint-core-version}</version>
</dependency>
<!-- Test Dependencies -->
Modified: camel/trunk/components/camel-test-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/pom.xml?rev=1452315&r1=1452314&r2=1452315&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-test-blueprint/pom.xml Mon Mar 4 14:08:20 2013
@@ -58,25 +58,26 @@
<!-- 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>
- <version>${aries-blueprint-version}</version>
+ <version>${aries-blueprint-core-version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>${aries-blueprint-version}</version>
+ <version>${aries-util-version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>${aries-blueprint-version}</version>
+ <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-version}</version>
+ <version>${aries-blueprint-proxy-version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.pojosr</groupId>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1452315&r1=1452314&r2=1452315&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Mar 4 14:08:20 2013
@@ -45,8 +45,11 @@
<aopalliance-bundle-version>1.0_6</aopalliance-bundle-version>
<apacheds-version>1.5.7</apacheds-version>
<apache-mime4j-version>0.7.2</apache-mime4j-version>
- <aries-blueprint-version>1.0.0</aries-blueprint-version>
- <aries-blueprint-core-version>1.0.1</aries-blueprint-core-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-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>
<asm-bundle-version>3.3_2</asm-bundle-version>
@@ -1946,7 +1949,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>${aries-blueprint-version}</version>
+ <version>${aries-blueprint-core-version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1452315&r1=1452314&r2=1452315&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Mon Mar 4 14:08:20 2013
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>${aries-blueprint-version}</version>
+ <version>${aries-blueprint-core-version}</version>
<scope>provided</scope>
</dependency>
<dependency>