You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/09/26 16:57:27 UTC

svn commit: r1390538 - in /karaf/trunk/itests: pom.xml src/test/java/org/apache/karaf/itests/KarafTestSupport.java

Author: cschneider
Date: Wed Sep 26 14:57:27 2012
New Revision: 1390538

URL: http://svn.apache.org/viewvc?rev=1390538&view=rev
Log:
KARAF-1877 Trying to make the itests more similar to the regression tests to see if that helps with jenkins

Modified:
    karaf/trunk/itests/pom.xml
    karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java

Modified: karaf/trunk/itests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/pom.xml?rev=1390538&r1=1390537&r2=1390538&view=diff
==============================================================================
--- karaf/trunk/itests/pom.xml (original)
+++ karaf/trunk/itests/pom.xml Wed Sep 26 14:57:27 2012
@@ -48,6 +48,7 @@
             <groupId>org.apache.karaf</groupId>
             <artifactId>apache-karaf</artifactId>
             <version>${project.version}</version>
+            <scope>test</scope>
             <type>tar.gz</type>
             <exclusions>
                 <exclusion>

Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java?rev=1390538&r1=1390537&r2=1390538&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java Wed Sep 26 14:57:27 2012
@@ -66,8 +66,8 @@ public class KarafTestSupport {
     @Configuration
     public Option[] config() {
         return new Option[]{
-            karafDistributionConfiguration().frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("tar.gz"))
-                    .karafVersion(MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf")).name("Apache Karaf").unpackDirectory(new File("target/exam")),
+            karafDistributionConfiguration().frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("zip"))
+                    .name("Apache Karaf").unpackDirectory(new File("target/exam")),
                 keepRuntimeFolder(),
                 logLevel(LogLevelOption.LogLevel.ERROR) };
     }