Author: davsclaus
Date: Fri Oct 26 09:05:55 2012
New Revision: 1402441
URL: http://svn.apache.org/viewvc?rev=1402441&view=rev
Log:
CAMEL-5746: camel-blueprint requires Apache Aries 0.3+. Upgraded some
dependencies for camel-test-blueprint, in line to support Aries 1.0.0 as well.
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=1402441&r1=1402440&r2=1402441&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Fri Oct 26 09:05:55 2012
@@ -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.2,2)",
+ org.apache.aries*;version="[0.3,2)",
*
</camel.osgi.import>
<camel.osgi.export>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1402441&r1=1402440&r2=1402441&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Oct 26 09:05:55 2012
@@ -110,9 +110,9 @@
<exec-maven-plugin-version>1.2.1</exec-maven-plugin-version>
<ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version>
<fastinfoset-version>1.2.7_4</fastinfoset-version>
- <felix-compendium-version>1.2.0</felix-compendium-version>
- <felix-configadmin-version>1.2.4</felix-configadmin-version>
- <felix-framework-version>2.0.5</felix-framework-version>
+ <felix-compendium-version>1.4.0</felix-compendium-version>
+ <felix-configadmin-version>1.4.0</felix-configadmin-version>
+ <felix-framework-version>3.2.2</felix-framework-version>
<flatpack-bundle-version>3.2.0_2</flatpack-bundle-version>
<fop-bundle-version>1.0_3</fop-bundle-version>
<fop-version>1.0</fop-version>
@@ -254,7 +254,7 @@
<opensaml-version>2.5.1_2</opensaml-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
<oscache-bundle-version>2.4_5</oscache-bundle-version>
- <osgi-version>4.2.0</osgi-version>
+ <osgi-version>4.3.0</osgi-version>
<paranamer-bundle-version>2.4_1</paranamer-bundle-version>
<pax-exam-version>2.5.0</pax-exam-version>
<paxexam-karaf-container-version>1.0.0</paxexam-karaf-container-version>
@@ -1829,7 +1829,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
+ <version>${felix-configadmin-version}</version>
</dependency>
<!-- need this to use the new 'maven-archetype' packaging type -->
