svn commit: r1143265 - in /camel/trunk: parent/pom.xml tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java

[davsclaus]

Author: davsclaus
Date: Wed Jul  6 06:59:10 2011
New Revision: 1143265

URL: http://svn.apache.org/viewvc?rev=1143265&view=rev
Log:
CAMEL-4172: Upgrade to karaf 2.2.2.

Modified:
    camel/trunk/parent/pom.xml
    
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1143265&r1=1143264&r2=1143265&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jul  6 06:59:10 2011
@@ -107,6 +107,9 @@
     <jsch-version>0.1.44-1</jsch-version>
     <juel-version>2.1.2</juel-version>
     <junit-version>4.8.1</junit-version>
+    <!-- TODO: when updating karaf, also update the file:
+         
tests/camel-itest-karaf/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+    -->
     <karaf-version>2.2.2</karaf-version>
     <log4j-version>1.2.16</log4j-version>
     <lucene-version>3.0.3</lucene-version>

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=1143265&r1=1143264&r2=1143265&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 Jul  6 06:59:10 2011
@@ -141,7 +141,7 @@ public abstract class AbstractFeatureTes
     }
     
     public static UrlReference getKarafFeatureUrl() {
-        String karafVersion = "2.2.1";
+        String karafVersion = "2.2.2";
         System.out.println("*** The karaf version is " + karafVersion + " 
***");
 
         String type = "xml/features";