From 45d4dcb4791926bc71111c267da901d767b9aacb Mon Sep 17 00:00:00 2001
From: Krzysztof Sobkowiak <Krzys.Sobkowiak@gmail.com>
Date: Wed, 16 Jan 2013 01:32:22 +0100
Subject: [PATCH 2/3] Upgraded to Karaf 2.3.0 - itests corrected

---
 itest/pom.xml                                      |    4 +-
 .../webconsole/itest/FeaturesIntegrationTest.java  |    2 +-
 pom.xml                                            |   49 ++++++++++++++++++--
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/itest/pom.xml b/itest/pom.xml
index 7f5d628..d71a611 100644
--- a/itest/pom.xml
+++ b/itest/pom.xml
@@ -39,8 +39,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openengsb.labs.paxexam.karaf</groupId>
-            <artifactId>paxexam-karaf-container</artifactId>
+            <groupId>org.apache.karaf.tooling.exam</groupId>
+            <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java b/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java
index 1f0212a..071e998 100644
--- a/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java
+++ b/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java
@@ -17,7 +17,7 @@
 package org.apache.karaf.webconsole.itest;
 
 import static junit.framework.Assert.assertTrue;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
 import static org.ops4j.pax.exam.CoreOptions.maven;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
diff --git a/pom.xml b/pom.xml
index 7a5df6a..61ba5e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,8 @@
         <maven-bundle.version>2.3.7</maven-bundle.version>
         <osgi.version>4.2.0</osgi.version>
         <pax-exam-karaf.version>0.5.0</pax-exam-karaf.version>
-        <pax-exam-junit.version>2.3.0</pax-exam-junit.version>
+        <pax-exam-junit.version>2.6.0</pax-exam-junit.version>
+        <pax-exam.version>2.6.0</pax-exam.version>
         <pax-logging.version>1.6.4</pax-logging.version>
         <pax-wicket.version>2.0.1</pax-wicket.version>
         <scala.version>2.9.1</scala.version>
@@ -460,9 +461,9 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.openengsb.labs.paxexam.karaf</groupId>
-                <artifactId>paxexam-karaf-container</artifactId>
-                <version>${pax-exam-karaf.version}</version>
+                <groupId>org.apache.karaf.tooling.exam</groupId>
+                <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
+                <version>${karaf.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -471,6 +472,46 @@
                 <version>${pax-exam-junit.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam</artifactId>
+                <version>${pax-exam.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-container-remote</artifactId>
+                <version>${pax-exam.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-spi</artifactId>
+                <version>${pax-exam.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-invoker-junit</artifactId>
+                <version>${pax-exam.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-container-rbc</artifactId>
+                <version>${pax-exam.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-container-rbc-client</artifactId>
+                <version>${pax-exam.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-extender-service</artifactId>
+                <version>${pax-exam.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-inject</artifactId>
+                <version>${pax-exam.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
-- 
1.7.9.5