You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2010/07/07 10:50:37 UTC
svn commit: r961308 - in /servicemix/smx4/features/trunk:
assembly/src/main/filtered-resources/camel-features.xml
assembly/src/main/filtered-resources/features.xml pom.xml
Author: ffang
Date: Wed Jul 7 08:50:37 2010
New Revision: 961308
URL: http://svn.apache.org/viewvc?rev=961308&view=rev
Log:
[SMX-551] upgrade to spring 3.x
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml?rev=961308&r1=961307&r2=961308&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml Wed Jul 7 08:50:37 2010
@@ -23,7 +23,7 @@
<feature version='${camel.version}'>camel-spring-osgi</feature>
</feature>
<feature name='camel-core' version='${camel.version}'>
- <feature version="2.5.6.SEC01">spring</feature>
+ <feature version="${spring.version}">spring</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/1.4.0</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/1.4.0</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/1.4.0</bundle>
@@ -33,9 +33,9 @@
</feature>
<feature name='camel-spring-osgi' version='${camel.version}'>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
- <feature version='2.5.6.SEC01'>spring</feature>
- <feature version='1.2.0'>spring2-dm</feature>
- <bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
+ <feature version='${spring.version}'>spring</feature>
+ <feature version='1.2.0'>spring-dm</feature>
+ <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
<feature version='${camel.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-spring-osgi/${camel.version}</bundle>
</feature>
@@ -47,7 +47,7 @@
<feature name='camel-cxf' version='${camel.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
- <bundle>mvn:org.springframework/spring-jms/2.5.6.SEC01</bundle>
+ <bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/2.2.3_3</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
@@ -127,14 +127,14 @@
<bundle>mvn:org.apache.camel/camel-servlet/${camel.version}</bundle>
</feature>
<feature name='camel-jms' version='${camel.version}'>
- <bundle>mvn:org.springframework/spring-core/2.5.6.SEC01</bundle>
- <bundle>mvn:org.springframework/spring-beans/2.5.6.SEC01</bundle>
- <bundle>mvn:org.springframework/spring-context/2.5.6.SEC01</bundle>
- <bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</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/1.1.1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
- <bundle>mvn:org.springframework/spring-jms/2.5.6.SEC01</bundle>
+ <bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
<feature version='${camel.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jms/${camel.version}</bundle>
</feature>
@@ -154,17 +154,17 @@
</feature>
<feature name='camel-bam' version='${camel.version}'>
<feature>http</feature>
- <bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
- <bundle>mvn:org.springframework/spring-web/2.5.6.SEC01</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/1.1.1</bundle>
- <bundle>mvn:org.springframework/spring-jdbc/2.5.6.SEC01</bundle>
+ <bundle>mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
<bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle>mvn:commons-lang/commons-lang/2.4</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
- <bundle>mvn:org.springframework/spring-orm/2.5.6.SEC01</bundle>
+ <bundle>mvn:org.springframework/spring-orm/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/2.4_3</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/2.3.4.726_2</bundle>
<feature version='${camel.version}'>camel-core</feature>
@@ -275,10 +275,10 @@
</feature>
<feature name='camel-jpa' version='${camel.version}'>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
- <bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
+ <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
- <bundle>mvn:org.springframework/spring-jdbc/2.5.6.SEC01</bundle>
+ <bundle>mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
<bundle>mvn:commons-lang/commons-lang/2.4</bundle>
<bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
@@ -287,7 +287,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.13.1_2</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/1.2.1_2</bundle>
- <bundle>mvn:org.springframework/spring-orm/2.5.6.SEC01</bundle>
+ <bundle>mvn:org.springframework/spring-orm/${spring.version}</bundle>
<feature version='${camel.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jpa/${camel.version}</bundle>
</feature>
@@ -313,8 +313,8 @@
<bundle>mvn:org.apache.camel/camel-ldap/${camel.version}</bundle>
</feature>
<feature name='camel-mail' version='${camel.version}'>
- <bundle>mvn:org.springframework/spring-context/2.5.6.SEC01</bundle>
- <bundle>mvn:org.springframework/spring-context-support/2.5.6.SEC01</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/1.4.3</bundle>
<feature version='${camel.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mail/${camel.version}</bundle>
@@ -408,16 +408,16 @@
<!-- current camel-spring-javaconfig need to use spring 3.0.0.RELEASE, so we comment it out
feature name='camel-spring-javaconfig' version='${camel.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
- <bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework/org.springframework.test/2.5.6.SEC01</bundle>
+ <bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework/org.springframework.test/${spring.version}</bundle>
<bundle>mvn:http://svn.apache.org/repos/asf/camel/m2-repo!org.springframework.javaconfig/org.springframework.config.java/1.0.0-20090215</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
<feature version='${camel.version}'>camel-spring-osgi</feature>
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${camel.version}</bundle>
</feature-->
<feature name='camel-sql' version='${camel.version}'>
- <bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
+ <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
- <bundle>mvn:org.springframework/spring-jdbc/2.5.6.SEC01</bundle>
+ <bundle>mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
<feature version='${camel.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-sql/${camel.version}</bundle>
</feature>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=961308&r1=961307&r2=961308&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Wed Jul 7 08:50:37 2010
@@ -20,7 +20,7 @@
<repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
<repository>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</repository>
<feature name="connector" version="${version}">
- <feature version="${servicemix.nmr.version}">transaction</feature>
+ <feature version="${aries.transaction.version}">transaction</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo.connector.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>
@@ -29,7 +29,7 @@
<bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>
- <bundle>mvn:org.jencks/jencks/${jencks.version}</bundle>
+ <!--bundle>mvn:org.jencks/jencks/${jencks.version}</bundle-->
</feature>
<feature name="web-core" version="${version}">
<feature version="${karaf.version}">http</feature>
@@ -362,7 +362,7 @@
<!-- Default broker configuration -->
<feature name="activemq-broker" version="${version}">
- <feature>spring2-dm</feature>
+ <feature>spring-dm</feature>
<feature version="${activemq.version}">activemq</feature>
<bundle>spring:file:etc/activemq-broker.xml</bundle>
</feature>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=961308&r1=961307&r2=961308&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Jul 7 08:50:37 2010
@@ -145,7 +145,7 @@
<jaxrs.api.version>1.0</jaxrs.api.version>
<javax.mail.version>1.4.3</javax.mail.version>
<jcr-api.version>1.0_2</jcr-api.version>
- <jdt.core.version>3.2.3_2</jdt.core.version>
+ <jdt.core.version>3.2.3_3</jdt.core.version>
<jdom.version>1.1_2</jdom.version>
<jencks.version>2.2</jencks.version>
<jetty.version>6.1.22</jetty.version>
@@ -225,7 +225,7 @@
<serp.version>1.13.1_2</serp.version>
<smack.version>3.0.4_2</smack.version>
<snmp4j.version>1.8.1_3</snmp4j.version>
- <spring.version>2.5.6.SEC01</spring.version>
+ <spring.version>3.0.3.RELEASE</spring.version>
<spring.integration.version>1.0.0.RC2</spring.integration.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
<stringtemplate.version>3.2_3</stringtemplate.version>
@@ -251,6 +251,7 @@
<aries.blueprint.version>0.1-incubating</aries.blueprint.version>
<aries.util.version>0.1-incubating</aries.util.version>
<aries.jpa.version>0.1-incubating</aries.jpa.version>
+ <aries.transaction.version>0.1-incubating</aries.transaction.version>
<felix.gogo.version>0.2.2</felix.gogo.version>
<osgi.jmx.version>4.2.0.200907080519</osgi.jmx.version>
<sshd.version>0.3.0</sshd.version>