Author: jbonofre
Date: Wed Sep 1 08:06:27 2010
New Revision: 991461
URL: http://svn.apache.org/viewvc?rev=991461&view=rev
Log:
[KARAF-183] Upgrade to the latest release of ServiceMix Bundles.
Modified:
karaf/trunk/assembly/src/main/filtered-resources/features.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/features.xml?rev=991461&r1=991460&r2=991461&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/features.xml Wed Sep 1
08:06:27 2010
@@ -18,7 +18,7 @@
-->
<features name="karaf-${project.version}">
<feature name="spring" version="${spring.version}">
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
<bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-asm/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-expression/${spring.version}</bundle>
@@ -29,7 +29,7 @@
</feature>
<feature name="spring-dm" version="${spring.osgi.version}">
<feature version="${spring.version}">spring</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=991461&r1=991460&r2=991461&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Sep 1 08:06:27 2010
@@ -98,8 +98,12 @@
</prerequisites>
<properties>
- <aopalliance.version>1.0_3</aopalliance.version>
- <cglib.version>2.1_3_4</cglib.version>
+ <!-- Apache ServiceMix Bundles -->
+ <aopalliance.bundle.version>1.0_4</aopalliance.bundle.version>
+ <cglib.bundle.version>2.1_3_6</cglib.bundle.version>
+ <jetty.bundle.version>6.1.22_2</jetty.bundle.version>
+ <junit.bundle.version>4.7_1</junit.bundle.version>
+
<commons.logging.version>1.1.1</commons.logging.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<depends.maven.plugin.version>1.0</depends.maven.plugin.version>
@@ -120,8 +124,6 @@
<aries.jmx.version>0.1-r964701</aries.jmx.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<jansi.version>1.2</jansi.version>
- <jetty.bundle.version>6.1.22_1</jetty.bundle.version>
- <junit.version>4.7_1</junit.version>
<jline.version>0.9.95.20100209</jline.version>
<jsw.version>3.2.3</jsw.version>
<log4j.version>1.2.16</log4j.version>
@@ -570,7 +572,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
- <version>${junit.version}</version>
+ <version>${junit.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
