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

[ningjiang]

Author: ningjiang
Date: Mon May 30 08:57:08 2011
New Revision: 1129069

URL: http://svn.apache.org/viewvc?rev=1129069&view=rev
Log:
Fixed the camel-osgi-karaf test error.

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

Modified: camel/trunk/tests/camel-itest-karaf/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1129069&r1=1129068&r2=1129069&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/pom.xml (original)
+++ camel/trunk/tests/camel-itest-karaf/pom.xml Mon May 30 08:57:08 2011
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.camel.karaf</groupId>
             <artifactId>apache-camel</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>

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=1129069&r1=1129068&r2=1129069&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 May 30 08:57:08 2011
@@ -155,7 +155,7 @@ public abstract class AbstractFeatureTes
 
     public static Option[] configure(String feature, boolean useFelix, boolean 
useEquinox) {
         Option[] options = options(
-            profile("log").version("1.4"),
+            profile("log").version("1.6.1"),
             // this is how you set the default log level when using pax 
logging (logProfile)
             
org.ops4j.pax.exam.CoreOptions.systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),