Author: davsclaus
Date: Sat Feb 5 14:14:51 2011
New Revision: 1067446
URL: http://svn.apache.org/viewvc?rev=1067446&view=rev
Log:
CAMEL-3604: features.xml renamed spring3 to spring.
Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1067446&r1=1067445&r2=1067446&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Sat Feb 5 14:14:51 2011
@@ -115,7 +115,7 @@
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<serp-bundle-version>1.13.1_2</serp-bundle-version>
<smack-bundle-version>3.1.0_1</smack-bundle-version>
- <spring3-version>3.0.5.RELEASE</spring3-version>
+ <spring-version>3.0.5.RELEASE</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spymemcached-bundle-version>2.5_1</spymemcached-bundle-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1067446&r1=1067445&r2=1067446&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat
Feb 5 14:14:51 2011
@@ -17,19 +17,19 @@
limitations under the License.
-->
<features>
- <feature name='spring' version='${spring3-version}'>
+ <feature name='spring' version='${spring-version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
- <bundle>mvn:org.springframework/spring-asm/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-aop/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-aspects/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-core/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-beans/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-context/${spring3-version}</bundle>
-
<bundle>mvn:org.springframework/spring-context-support/${spring3-version}</bundle>
-
<bundle>mvn:org.springframework/spring-expression/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-asm/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-aspects/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
+
<bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
+
<bundle>mvn:org.springframework/spring-expression/${spring-version}</bundle>
</feature>
<feature name='spring-dm' version='${spring-osgi-version}'>
- <feature version='${spring3-version}'>spring</feature>
+ <feature version='${spring-version}'>spring</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</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>
@@ -56,7 +56,7 @@
<feature version='${pom.version}'>camel-spring</feature>
</feature>
<feature name='camel-core' version='${pom.version}'>
- <feature version="${spring3-version}">spring</feature>
+ <feature version="${spring-version}">spring</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
@@ -66,9 +66,9 @@
</feature>
<feature name='camel-spring' version='${pom.version}'>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <feature version='${spring3-version}'>spring</feature>
+ <feature version='${spring-version}'>spring</feature>
<feature version='${spring-osgi-version}'>spring-dm</feature>
- <bundle>mvn:org.springframework/spring-tx/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-spring/${pom.version}</bundle>
</feature>
@@ -85,7 +85,7 @@
<feature name='camel-cxf' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
- <bundle>mvn:org.springframework/spring-jms/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-jms/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
@@ -173,14 +173,14 @@
<bundle>mvn:org.apache.camel/camel-servlet/${pom.version}</bundle>
</feature>
<feature name='camel-jms' version='${pom.version}'>
- <bundle>mvn:org.springframework/spring-core/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-beans/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-context/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-tx/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
- <bundle>mvn:org.springframework/spring-jms/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-jms/${spring-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jms/${pom.version}</bundle>
</feature>
@@ -212,17 +212,17 @@
<bundle>mvn:org.apache.camel/camel-aws/${pom.version}</bundle>
</feature>
<feature name='camel-bam' version='${pom.version}'>
- <bundle>mvn:org.springframework/spring-tx/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-web/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <bundle>mvn:org.springframework/spring-jdbc/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
<bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix-specs-version}</bundle>
- <bundle>mvn:org.springframework/spring-orm/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
@@ -391,10 +391,10 @@
<bundle>mvn:org.apache.camel/camel-jdbc/${pom.version}</bundle>
</feature>
<feature name='camel-jdbc-aggregator' version='${pom.version}'>
- <bundle>mvn:org.springframework/spring-core/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-tx/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
- <bundle>mvn:org.springframework/spring-jdbc/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jdbc-aggregator/${pom.version}</bundle>
</feature>
<feature name='camel-josql' version='${pom.version}'>
@@ -404,10 +404,10 @@
</feature>
<feature name='camel-jpa' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix-specs-version}</bundle>
- <bundle>mvn:org.springframework/spring-tx/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <bundle>mvn:org.springframework/spring-jdbc/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
@@ -416,7 +416,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/${openjpa-bundle-version}</bundle>
- <bundle>mvn:org.springframework/spring-orm/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jpa/${pom.version}</bundle>
</feature>
@@ -453,8 +453,8 @@
<bundle>mvn:org.apache.camel/camel-lucene/${pom.version}</bundle>
</feature>
<feature name='camel-mail' version='${pom.version}'>
- <bundle>mvn:org.springframework/spring-context/${spring3-version}</bundle>
-
<bundle>mvn:org.springframework/spring-context-support/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
+
<bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
<bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mail/${pom.version}</bundle>
@@ -593,7 +593,7 @@
<feature name='camel-spring-javaconfig' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
- <bundle>mvn:org.springframework/spring-test/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-test/${spring-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${pom.version}</bundle>
</feature>
<feature name='camel-spring-security' version='${pom.version}'>
@@ -606,9 +606,9 @@
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
- <bundle>mvn:org.springframework/spring-jms/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-web/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-webmvc/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-jms/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-webmvc/${spring-version}</bundle>
<bundle>mvn:org.springframework.ws/spring-xml/${spring-ws-version}</bundle>
<bundle>mvn:org.springframework.ws/spring-oxm/${spring-ws-version}</bundle>
<bundle>mvn:org.springframework.ws/spring-ws-core/${spring-ws-version}</bundle>
@@ -616,9 +616,9 @@
<bundle>mvn:org.apache.camel/camel-spring-ws/${pom.version}</bundle>
</feature>
<feature name='camel-sql' version='${pom.version}'>
- <bundle>mvn:org.springframework/spring-tx/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <bundle>mvn:org.springframework/spring-jdbc/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-sql/${pom.version}</bundle>
</feature>
