You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/04/30 13:04:30 UTC

svn commit: r770162 - in /felix/trunk/karaf/itests: pom.xml src/test/java/org/apache/servicemix/kernel/gshell/itests/AbstractIntegrationTest.java

Author: gnodet
Date: Thu Apr 30 11:04:29 2009
New Revision: 770162

URL: http://svn.apache.org/viewvc?rev=770162&view=rev
Log:
Improve integration test speed

Modified:
    felix/trunk/karaf/itests/pom.xml
    felix/trunk/karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/AbstractIntegrationTest.java

Modified: felix/trunk/karaf/itests/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/itests/pom.xml?rev=770162&r1=770161&r2=770162&view=diff
==============================================================================
--- felix/trunk/karaf/itests/pom.xml (original)
+++ felix/trunk/karaf/itests/pom.xml Thu Apr 30 11:04:29 2009
@@ -89,6 +89,35 @@
             <version>4.5</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.ops4j.pax.runner.profiles</groupId>
+            <artifactId>log</artifactId>
+            <version>1.3.0</version>
+            <type>composite</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.runner.profiles</groupId>
+            <artifactId>felix.config</artifactId>
+            <version>1.0.10</version>
+            <type>composite</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.runner.profiles</groupId>
+            <artifactId>spring</artifactId>
+            <version>2.5.6</version>
+            <type>composite</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.runner.profiles</groupId>
+            <artifactId>spring.dm</artifactId>
+            <version>1.2.0-rc1</version>
+            <type>composite</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <repositories>
@@ -97,17 +126,14 @@
             <url>http://repository.ops4j.org/maven2</url>
         </repository>
         <repository>
-            <id>ops4j.snapshots</id>
-            <url>http://repository.ops4j.org/mvn-snapshots</url>
+            <id>ops4j.profiles</id>
+            <url>http://scm.ops4j.org/repos/ops4j/projects/pax/runner-repository</url>
         </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>
             <id>ops4j.releases</id>
             <url>http://repository.ops4j.org/maven2</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
         </pluginRepository>
     </pluginRepositories>
 

Modified: felix/trunk/karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/AbstractIntegrationTest.java?rev=770162&r1=770161&r2=770162&view=diff
==============================================================================
--- felix/trunk/karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/AbstractIntegrationTest.java (original)
+++ felix/trunk/karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/AbstractIntegrationTest.java Thu Apr 30 11:04:29 2009
@@ -108,8 +108,8 @@
     public static Option[] configuration() {
         Option[] options = options(
             // install log service using pax runners profile abstraction (there are more profiles, like DS)
-            logProfile(),
-            configProfile(),
+            profile("log").version("1.3.0"),
+            profile("felix.config").version("1.0.10"),
             profile("spring.dm").version("1.2.0-rc1"),
 
             // this is how you set the default log level when using pax logging (logProfile)