FELIX-1761: include felix as a platform for karaf integration tests
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@825613 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/CoreTest.java b/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/CoreTest.java
index f8ed58d..cb181cc 100644
--- a/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/CoreTest.java
+++ b/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/CoreTest.java
@@ -119,7 +119,7 @@
systemProperty("karaf.startRemoteShell").value("false"),
// hack system packages
- systemPackages("org.apache.felix.karaf.main.spi;version=1.0.0", "org.apache.felix.karaf.jaas.boot;version=0.9.0"),
+ systemPackages("org.apache.felix.karaf.jaas.boot;version=1.99"),
bootClasspathLibrary(mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.boot")).afterFramework(),
bootClasspathLibrary(mavenBundle("org.apache.felix.karaf", "org.apache.felix.karaf.main")).afterFramework(),
@@ -140,7 +140,7 @@
mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.osgi"),
mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.log").noStart(),
- equinox()
+ equinox(), felix()
);
// We need to add pax-exam-junit here when running with the ibm
// jdk to avoid the following exception during the test run:
diff --git a/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/FeaturesTest.java b/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/FeaturesTest.java
index 7f3ff59..ec5d198 100644
--- a/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/FeaturesTest.java
+++ b/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/FeaturesTest.java
@@ -21,6 +21,7 @@
import org.junit.runner.RunWith;
import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary;
import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemPackages;
@@ -63,7 +64,7 @@
systemProperty("karaf.startRemoteShell").value("false"),
// hack system packages
- systemPackages("org.apache.felix.karaf.main.spi;version=1.0.0", "org.apache.felix.karaf.jaas.boot;version=0.9.0"),
+ systemPackages("org.apache.felix.karaf.jaas.boot;version=1.99"),
bootClasspathLibrary(mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.boot")).afterFramework(),
bootClasspathLibrary(mavenBundle("org.apache.felix.karaf", "org.apache.felix.karaf.main")).afterFramework(),
@@ -91,7 +92,7 @@
"obr", "wrapper"
),
- equinox()
+ equinox(), felix()
);
// We need to add pax-exam-junit here when running with the ibm
// jdk to avoid the following exception during the test run:
diff --git a/karaf/pom.xml b/karaf/pom.xml
index ec74eed..28a1f89 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -91,9 +91,9 @@
<log4j.version>1.2.14</log4j.version>
<maven.version>2.0.9</maven.version>
<mina.version>2.0.0-M6</mina.version>
- <pax.exam.version>1.0.0</pax.exam.version>
+ <pax.exam.version>1.1.0</pax.exam.version>
<pax.logging.version>1.4</pax.logging.version>
- <pax.runner.version>1.1.1</pax.runner.version>
+ <pax.runner.version>1.2.1</pax.runner.version>
<pax.url.version>1.0.0</pax.url.version>
<pax.web.version>0.6.0</pax.web.version>
<servlet.api.version>2.5</servlet.api.version>