You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/02/16 12:00:30 UTC
svn commit: r1071206 - 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: davsclaus
Date: Wed Feb 16 11:00:29 2011
New Revision: 1071206
URL: http://svn.apache.org/viewvc?rev=1071206&view=rev
Log:
Upgraded to karaf 2.1.4 for testing.
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=1071206&r1=1071205&r2=1071206&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 Wed Feb 16 11:00:29 2011
@@ -134,16 +134,14 @@ public abstract class AbstractFeatureTes
public static UrlReference getCamelKarafFeatureUrl() {
String springVersion = System.getProperty("springVersion");
System.out.println("*** The spring version is " + springVersion + " ***");
- String type = "xml/features";
- if (springVersion != null && springVersion.startsWith("2")) {
- type = "xml/features-spring2";
- }
+
+ String type = "xml/features";
return mavenBundle().groupId("org.apache.camel.karaf").
artifactId("apache-camel").versionAsInProject().type(type);
}
public static UrlReference getKarafFeatureUrl() {
- String karafVersion = "2.1.3";
+ String karafVersion = "2.1.4";
System.out.println("*** The karaf version is " + karafVersion + " ***");
String type = "xml/features";
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=1071206&r1=1071205&r2=1071206&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 Wed Feb 16 11:00:29 2011
@@ -73,16 +73,14 @@ public class OSGiIntegrationTestSupport
public static UrlReference getCamelKarafFeatureUrl() {
String springVersion = System.getProperty("springVersion");
System.out.println("*** The spring version is " + springVersion + " ***");
- String type = "xml/features";
- if (springVersion != null && springVersion.startsWith("2")) {
- type = "xml/features-spring2";
- }
+
+ String type = "xml/features";
return mavenBundle().groupId("org.apache.camel.karaf").
artifactId("apache-camel").versionAsInProject().type(type);
}
public static UrlReference getKarafFeatureUrl() {
- String karafVersion = "2.1.3";
+ String karafVersion = "2.1.4";
System.out.println("*** The karaf version is " + karafVersion + " ***");
String type = "xml/features";