Author: davsclaus
Date: Mon Jan 28 16:54:08 2013
New Revision: 1439494
URL: http://svn.apache.org/viewvc?rev=1439494&view=rev
Log:
Use blueprint core 1.0.1, and blueprint 1.0.0 for the other blueprint stuff, as
it has mixed versions :(
Modified:
camel/trunk/components/camel-blueprint/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1439494&r1=1439493&r2=1439494&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Mon Jan 28 16:54:08 2013
@@ -35,7 +35,7 @@
!org.apache.camel.util.blueprint.*,
org.apache.camel.*;${camel.osgi.import.strict.version},
org.osgi.service.event*;resolution:=optional,
- org.apache.aries*;version="[0.3,2)",
+ org.apache.aries*;version="[1.0,2)",
${camel.osgi.import.defaults},
*
</camel.osgi.import>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1439494&r1=1439493&r2=1439494&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Jan 28 16:54:08 2013
@@ -45,7 +45,8 @@
<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.1</aries-blueprint-version>
+ <aries-blueprint-version>1.0.0</aries-blueprint-version>
+ <aries-blueprint-core-version>1.0.1</aries-blueprint-core-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>
@@ -1900,7 +1901,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>${aries-blueprint-version}</version>
+ <version>${aries-blueprint-core-version}</version>
</dependency>
<!-- OSGi ConfigAdmin service -->
