Author: cmueller
Date: Thu Jan 12 07:43:15 2012
New Revision: 1230430
URL: http://svn.apache.org/viewvc?rev=1230430&view=rev
Log:
CAMEL-4885: Upgrade org.springframework 3.0.6.RELEASE -> 3.0.7.RELEASE
Modified:
camel/trunk/components/camel-spring-javaconfig/pom.xml
camel/trunk/examples/camel-example-spring-javaconfig/pom.xml
camel/trunk/parent/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=1230430&r1=1230429&r2=1230430&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/pom.xml (original)
+++ camel/trunk/components/camel-spring-javaconfig/pom.xml Thu Jan 12 07:43:15
2012
@@ -39,7 +39,6 @@
org.springframework.*;version="[3,4)",
*
</camel.osgi.import>
- <spring-version>3.0.5.RELEASE</spring-version>
<junit-version>4.8.1</junit-version>
</properties>
@@ -54,47 +53,11 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring-version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
<version>2.1_3_6</version>
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=1230430&r1=1230429&r2=1230430&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-javaconfig/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-javaconfig/pom.xml Thu Jan 12
07:43:15 2012
@@ -42,7 +42,6 @@
</camel.osgi.import>
<!-- avoid to import the bunch of spring related package -->
<camel.osgi.dynamic>*</camel.osgi.dynamic>
- <spring-version>3.0.5.RELEASE</spring-version>
<junit-version>4.8.1</junit-version>
</properties>
@@ -56,38 +55,15 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-javaconfig</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring-version}</version>
- </dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
<version>2.1_3_6</version>
</dependency>
-
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1230430&r1=1230429&r2=1230430&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan 12 07:43:15 2012
@@ -147,7 +147,7 @@
<solr-version>3.5.0</solr-version>
<spring-integration-version>2.0.5.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
- <spring-version>3.0.6.RELEASE</spring-version>
+ <spring-version>3.0.7.RELEASE</spring-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-security-version>3.0.7.RELEASE</spring-security-version>
<spring-ws-version>2.0.3.RELEASE</spring-ws-version>
