You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/07/09 10:36:36 UTC
svn commit: r962445 - in /camel/trunk: components/camel-spring-javaconfig/
examples/camel-example-spring-javaconfig/ parent/ platforms/karaf/features/
platforms/karaf/features/src/main/resources/
Author: ningjiang
Date: Fri Jul 9 08:36:35 2010
New Revision: 962445
URL: http://svn.apache.org/viewvc?rev=962445&view=rev
Log:
CAMEL-2928 Upgrade to Spring 3.0.x as default Spring version
Added:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml (props changed)
- copied unchanged from r962294, camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml (props changed)
- copied unchanged from r962294, camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
Removed:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
Modified:
camel/trunk/components/camel-spring-javaconfig/pom.xml
camel/trunk/examples/camel-example-spring-javaconfig/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
Modified: camel/trunk/components/camel-spring-javaconfig/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/pom.xml?rev=962445&r1=962444&r2=962445&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/pom.xml (original)
+++ camel/trunk/components/camel-spring-javaconfig/pom.xml Fri Jul 9 08:36:35 2010
@@ -40,7 +40,7 @@
*
</camel.osgi.import>
<spring-version>3.0.0.RELEASE</spring-version>
- <junit-version>4.6</junit-version>
+ <junit-version>4.8.1</junit-version>
</properties>
<repositories>
Modified: camel/trunk/examples/camel-example-spring-javaconfig/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-javaconfig/pom.xml?rev=962445&r1=962444&r2=962445&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-javaconfig/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-javaconfig/pom.xml Fri Jul 9 08:36:35 2010
@@ -38,11 +38,11 @@
org.springframework.osgi.*;version="[1.2,2)",
org.springframework.*;version="[3,4)",
org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool
- </camel.osgi.import>
+ </camel.osgi.import>
<!-- avoid to import the bunch of spring related package -->
<camel.osgi.dynamic>*</camel.osgi.dynamic>
<spring-version>3.0.0.RELEASE</spring-version>
- <junit-version>4.6</junit-version>
+ <junit-version>4.8.1</junit-version>
</properties>
<dependencies>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=962445&r1=962444&r2=962445&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Jul 9 08:36:35 2010
@@ -87,8 +87,7 @@
<jettison-version>1.2</jettison-version>
<jruby-version>1.4.0</jruby-version>
<juel-version>2.1.2</juel-version>
- <!-- spring 2.5.x is only compatible with junit 4.4 or lower - see SPR-5145 -->
- <junit-version>4.4</junit-version>
+ <junit-version>4.8.1</junit-version>
<log4j-version>1.2.16</log4j-version>
<lucene-version>3.0.1</lucene-version>
<mina-version>1.1.7</mina-version>
@@ -112,7 +111,7 @@
<spring-ehcache-version>1.6.2</spring-ehcache-version>
<spring-integration-version>1.0.4.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
- <spring-version>2.5.6</spring-version>
+ <spring-version>3.0.2.RELEASE</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
<stax-api-version>1.0.1</stax-api-version>
<stringtemplate-version>3.0</stringtemplate-version>
@@ -1521,17 +1520,12 @@
</build>
</profile>
<profile>
- <id>spring-3.x</id>
+ <id>spring-2.x</id>
<properties>
- <spring-version>3.0.3.RELEASE</spring-version>
- <junit-version>4.8.1</junit-version>
+ <spring-version>2.5.6</spring-version>
+ <!-- spring 2.5.x is only compatible with junit 4.4 or lower - see SPR-5145 -->
+ <junit-version>4.4</junit-version>
</properties>
- <!--repositories>
- <repository>
- <id>SpringSource Enterprise Bundle Repositorys</id>
- <url>http://repository.springsource.com/maven/bundles/release</url>
- </repository>
- </repositories-->
</profile>
<profile>
<id>on-sunjdk</id>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=962445&r1=962444&r2=962445&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Jul 9 08:36:35 2010
@@ -216,7 +216,7 @@
<classifier>features</classifier>
</artifact>
<artifact>
- <file>target/classes/features-spring3.xml</file>
+ <file>target/classes/features-spring2.xml</file>
<type>xml</type>
<classifier>features-spring3</classifier>
</artifact>
@@ -230,9 +230,9 @@
<profiles>
<profile>
- <id>spring3</id>
+ <id>spring-2.x</id>
<properties>
- <features.file>features-spring3.xml</features.file>
+ <features.file>features-spring2.xml</features.file>
</properties>
</profile>
<profile>
Propchange: camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml