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 2009/12/25 15:31:58 UTC
svn commit: r893861 - in /camel/trunk: components/pom.xml examples/pom.xml
parent/pom.xml
Author: ningjiang
Date: Fri Dec 25 14:31:58 2009
New Revision: 893861
URL: http://svn.apache.org/viewvc?rev=893861&view=rev
Log:
CAMEL-2316 Now Camel trunk build with spring3.x by default
Modified:
camel/trunk/components/pom.xml
camel/trunk/examples/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=893861&r1=893860&r2=893861&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Fri Dec 25 14:31:58 2009
@@ -104,16 +104,17 @@
</modules>
<profiles>
<profile>
- <id>spring-2.x</id>
+ <id>spring-3.x</id>
<activation>
- <property>
- <name>spring-version</name>
- <value>2.5.6</value>
- </property>
+ <activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <!-- current camel-spring only work with Spring 3.x-->
<module>camel-spring-javaconfig</module>
</modules>
</profile>
+ <profile>
+ <id>spring-2.x</id>
+ </profile>
</profiles>
</project>
Modified: camel/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/pom.xml?rev=893861&r1=893860&r2=893861&view=diff
==============================================================================
--- camel/trunk/examples/pom.xml (original)
+++ camel/trunk/examples/pom.xml Fri Dec 25 14:31:58 2009
@@ -72,18 +72,18 @@
<profiles>
<profile>
- <id>spring-2.x</id>
+ <id>spring-3.x</id>
<activation>
- <property>
- <name>spring-version</name>
- <value>2.5.6</value>
- </property>
+ <activeByDefault>true</activeByDefault>
</activation>
<modules>
- <!-- current this module just work for spring 2.x -->
+ <!-- current this module just work for spring 3.x -->
<module>camel-example-spring-javaconfig</module>
</modules>
</profile>
+ <profile>
+ <id>spring-2.x</id>
+ </profile>
<!--
This profile allows you to add a repository to the repo list so that
you can test the examples out against a staged version of the camel distribution
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=893861&r1=893860&r2=893861&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Dec 25 14:31:58 2009
@@ -34,6 +34,7 @@
<properties>
<compiler.fork>false</compiler.fork>
+ <spring-3.x>true</spring-3.x>
<!-- Note that activemq dependency is only used for testing! -->
<activemq-version>5.3.0</activemq-version>
<apacheds-version>1.5.4</apacheds-version>
@@ -56,7 +57,7 @@
<slf4j-version>1.5.8</slf4j-version>
<openjpa-version>1.2.1</openjpa-version>
<jruby-version>1.2.0</jruby-version>
- <spring-version>2.5.6</spring-version>
+ <spring-version>3.0.0.RELEASE</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
<mina-version>1.1.7</mina-version>
<javax-mail-version>1.4.1_2</javax-mail-version>
@@ -82,8 +83,7 @@
<hsqldb-version>1.8.0.7</hsqldb-version>
<groovy-version>1.7.0</groovy-version>
<guiceyfruit-version>2.0</guiceyfruit-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.6</junit-version>
<ognl-version>2.7.3_1</ognl-version>
<pax-exam-version>1.2.0</pax-exam-version>
<pax-tiny-bundle-version>1.2.0</pax-tiny-bundle-version>
@@ -116,6 +116,7 @@
<camel.osgi.import.strict.version>version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"</camel.osgi.import.strict.version>
<camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
<camel.osgi.import.defaults>
+ org.springframework.*;version="[2.5,4)",
org.apache.commons.logging.*;version="[1.1,2)",
org.apache.cxf.*;version="[2.2.5,3)",
org.apache.qpid.*;version="[0.5,0.6)",
@@ -133,10 +134,12 @@
freemarker.*;version="[2.3.15,3)",
javax.persistence.*;version="[1.1,2)",
</camel.osgi.import.defaults>
+ <camel.osgi.import.before.defaults />
<camel.osgi.import.additional />
<camel.osgi.import.pkg>
- !${camel.osgi.export.pkg},
+ !${camel.osgi.export.pkg},
org.apache.camel.*;${camel.osgi.import.camel.version},
+ ${camel.osgi.import.before.defaults},
${camel.osgi.import.defaults},
${camel.osgi.import.additional},
*
@@ -1274,10 +1277,12 @@
</build>
</profile>
<profile>
- <id>spring-3.0</id>
+ <id>spring-2.x</id>
<properties>
- <spring-version>3.0.0.RELEASE</spring-version>
- <junit-version>4.6</junit-version>
+ <spring-version>2.5.6</spring-version>
+ <spring-3.x>false</spring-3.x>
+ <!-- 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>