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/11 14:20:49 UTC
svn commit: r963062 - in /camel/trunk/tests:
camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Author: ningjiang
Date: Sun Jul 11 12:20:49 2010
New Revision: 963062
URL: http://svn.apache.org/viewvc?rev=963062&view=rev
Log:
CAMEL-2928 Upgrade spring version to 3.0.3.RELEASE by default
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=963062&r1=963061&r2=963062&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java Sun Jul 11 12:20:49 2010
@@ -135,8 +135,8 @@ public abstract class AbstractFeatureTes
String springVersion = System.getProperty("springVersion");
System.out.println("*** The spring version is " + springVersion + " ***");
String type = "xml/features";
- if (springVersion != null && springVersion.startsWith("3")) {
- type = "xml/features-spring3";
+ if (springVersion != null && springVersion.startsWith("2")) {
+ type = "xml/features-spring2";
}
return mavenBundle().groupId("org.apache.camel.karaf").
artifactId("apache-camel").versionAsInProject().type(type);
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=963062&r1=963061&r2=963062&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java Sun Jul 11 12:20:49 2010
@@ -66,8 +66,8 @@ public class OSGiIntegrationTestSupport
String springVersion = System.getProperty("springVersion");
System.out.println("*** The spring version is " + springVersion + " ***");
String type = "xml/features";
- if (springVersion != null && springVersion.startsWith("3")) {
- type = "xml/features-spring3";
+ if (springVersion != null && springVersion.startsWith("2")) {
+ type = "xml/features-spring2";
}
return mavenBundle().groupId("org.apache.camel.karaf").
artifactId("apache-camel").versionAsInProject().type(type);