camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1143324 - in /camel/trunk: parent/pom.xml tests/camel-itest-karaf/pom.xml tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java tests/camel-itest-osgi/pom.xml
Date Wed, 06 Jul 2011 10:06:32 GMT
Author: ningjiang
Date: Wed Jul  6 10:06:31 2011
New Revision: 1143324

URL: http://svn.apache.org/viewvc?rev=1143324&view=rev
Log:
CAMEL-4172: Upgrade to karaf 2.2.2, camel-itest-karaf reads the karaf version from system
properties

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

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1143324&r1=1143323&r2=1143324&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jul  6 10:06:31 2011
@@ -107,9 +107,6 @@
     <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/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1143324&r1=1143323&r2=1143324&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/pom.xml (original)
+++ camel/trunk/tests/camel-itest-karaf/pom.xml Wed Jul  6 10:06:31 2011
@@ -143,7 +143,7 @@
                         <exclude>**/*Cxf*.*</exclude>
                     </excludes>
                     <systemPropertyVariables>
-                        <springVersion>${spring-version}</springVersion>
+                        <karafVersion>${karaf-version}</karafVersion>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
@@ -180,7 +180,7 @@
                                 <exclude>**/*Test.*</exclude>
                             </excludes>
                             <systemPropertyVariables>
-                                <springVersion>${spring-version}</springVersion>
+                                <karafVersion>${karaf-version}</karafVersion>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>

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=1143324&r1=1143323&r2=1143324&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 10:06:31 2011
@@ -132,16 +132,13 @@ 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";
         return mavenBundle().groupId("org.apache.camel.karaf").
             artifactId("apache-camel").versionAsInProject().type(type);
     }
     
     public static UrlReference getKarafFeatureUrl() {
-        String karafVersion = "2.2.2";
+        String karafVersion = System.getProperty("karafVersion");
         System.out.println("*** The karaf version is " + karafVersion + " ***");
 
         String type = "xml/features";

Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1143324&r1=1143323&r2=1143324&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Wed Jul  6 10:06:31 2011
@@ -344,7 +344,6 @@
                   <exclude>**/FIXMETest.*</exclude>
               </excludes>
               <systemPropertyVariables>
-                  <springVersion>${spring-version}</springVersion>
                   <karafVersion>${karaf-version}</karafVersion>
               </systemPropertyVariables>
           </configuration>
@@ -408,7 +407,7 @@
                             <exclude>**/JaxbFallbackConverterTest.*</exclude>
                         </excludes>               
                         <systemPropertyVariables>
-                            <springVersion>${spring-version}</springVersion>
+                            <karafVersion>${karaf-version}</karafVersion>
                         </systemPropertyVariables>
                     </configuration>
                 </plugin>



Mime
View raw message