svn commit: r1387396 - in /camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi: OSGiIntegrationTestSupport.java jms/JmsTest.java

[cmueller]

Author: cmueller
Date: Tue Sep 18 22:17:54 2012
New Revision: 1387396

URL: http://svn.apache.org/viewvc?rev=1387396&view=rev
Log:
alligned the karaf and activemq version

Modified:
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java

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=1387396&r1=1387395&r2=1387396&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
 Tue Sep 18 22:17:54 2012
@@ -131,7 +131,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.2.7")
+                          .karafVersion("2.2.9")
                           .name("Apache Karaf")
                           .useDeployFolder(false).unpackDirectory(new 
File("target/paxexam/unpack/")),
 

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java?rev=1387396&r1=1387395&r2=1387396&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java
 Tue Sep 18 22:17:54 2012
@@ -27,9 +27,6 @@ import org.springframework.osgi.context.
 import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 
-/**
- * @version 
- */
 @RunWith(JUnit4TestRunner.class)
 public class JmsTest extends OSGiIntegrationSpringTestSupport {
 
@@ -53,7 +50,7 @@ public class JmsTest extends OSGiIntegra
             getDefaultCamelKarafOptions(),
                 
             // using the features to install AMQ
-            
scanFeatures("mvn:org.apache.activemq/activemq-karaf/5.4.0/xml/features", 
"activemq"),
+            
scanFeatures("mvn:org.apache.activemq/activemq-karaf/5.6.0/xml/features", 
"activemq"),
 
             // using the features to install the camel components
             loadCamelFeatures("camel-jms"));