svn commit: r1452282 - in /camel/trunk: parent/ tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/ tests/camel-itest-osgi/ tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/

[davsclaus]

Author: davsclaus
Date: Mon Mar  4 13:05:45 2013
New Revision: 1452282

URL: http://svn.apache.org/r1452282
Log:
Upgraded to Karaf 2.3.1

Modified:
    camel/trunk/parent/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
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1452282&r1=1452281&r2=1452282&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Mar  4 13:05:45 2013
@@ -225,7 +225,7 @@
     <junit-bundle-version>4.11_1</junit-bundle-version>
     <junit-version>4.11</junit-version>
     <jython-version>2.5.3</jython-version>
-    <karaf-version>2.3.0</karaf-version>
+    <karaf-version>2.3.1</karaf-version>
     <krati-version>0.4.8</krati-version>
     <kxml2-bundle-version>2.3.0_2</kxml2-bundle-version>
     <leveldbjni-version>1.6</leveldbjni-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=1452282&r1=1452281&r2=1452282&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
 Mon Mar  4 13:05:45 2013
@@ -157,7 +157,7 @@ public abstract class AbstractFeatureTes
                 karafDistributionConfiguration().frameworkUrl(
                     
maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
                     //This version doesn't affect the version of karaf we use 
-                    .karafVersion("2.3.0").name("Apache Karaf")
+                    .karafVersion("2.3.1").name("Apache Karaf")
                     .unpackDirectory(new File("target/paxexam/unpack/")),
                 
                 KarafDistributionOption.keepRuntimeFolder(),

Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1452282&r1=1452281&r2=1452282&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Mon Mar  4 13:05:45 2013
@@ -90,9 +90,29 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
       <scope>test</scope>
     </dependency>
+         <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-spring</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-kahadb-store</artifactId>
+            <scope>test</scope>
+        </dependency>
+   <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-pool</artifactId>
+        <scope>test</scope>
+      </dependency>
     <dependency>
       <groupId>org.apache.camel.karaf</groupId>
       <artifactId>apache-camel</artifactId>

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=1452282&r1=1452281&r2=1452282&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
 Mon Mar  4 13:05:45 2013
@@ -133,7 +133,7 @@ public class OSGiIntegrationTestSupport 
                       karafDistributionConfiguration()
                           
.frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
                           // This version is not actual karaf version that we 
use.
-                          .karafVersion("2.3.0")
+                          .karafVersion("2.3.1")
                           .name("Apache Karaf")
                           .useDeployFolder(false).unpackDirectory(new 
File("target/paxexam/unpack/")),