Fix build by referencing correct dependencies.

This patch fixes a broken build by pulling in the
correct version of PAX exam. It also migrates the
karaf container from 3.0.1 to 3.0.2.  This fix should
eventually be replaced by a patch that converts to the
pom/project structure, as per the ODL "best practices"
that is defined in the archetype.

Change-Id: Ia626643c2cdb2bedc2b9df08cc267a8aa9902ad1
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 7849289f6bdc6e23ee92a5ee0961266eb49795d6..b4c7be530657f150a4c1e68508c66415fb6c25f0 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -25,6 +25,8 @@
     <groupbasedpolicy.project.version>0.2.0-SNAPSHOT</groupbasedpolicy.project.version>
     <config.groupbasedpolicy.ofoverlayconfigfile>15-groupbasedpolicy-ofoverlay.xml</config.groupbasedpolicy.ofoverlayconfigfile>
     <config.groupbasedpolicy.openstackendpointconfigfile>15-groupbasedpolicy-openstackendpoint.xml</config.groupbasedpolicy.openstackendpointconfigfile>
+    <karaf.version>3.0.2</karaf.version>
+    <exam.version>4.4.0</exam.version> <!-- Needs to remain exported, as its used for dependencies, too -->
   </properties>
 
   <build>

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 7b21f9c0c46180af0d90d32eb175d281410995c1..53242c6ff3d77faa28a89b49d8d0dca581506796 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -16,7 +16,6 @@
   <properties>
     <branding.version>1.1.0-SNAPSHOT</branding.version>
     <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
-    <karaf.version>3.0.1</karaf.version>
   </properties>
 
   <dependencies>
@@ -35,6 +34,20 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <!-- Add Pax Exam -->
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam</artifactId>
+      <version>${exam.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-karaf</artifactId>
+      <version>${exam.version}</version>
+      <scope>test</scope>
+    </dependency>
+
 
     <!-- ODL Branding -->
     <dependency>

diff --git a/features/pom.xml b/features/pom.xml
index 862ff199ff13856b35809f461a12a3e3ca94c799..45b973c40a388a40f7c180406744f03a372bad6e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -20,7 +20,6 @@
     <features.file>features.xml</features.file>
     <branding.version>1.1.0-SNAPSHOT</branding.version>
     <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
-    <karaf.version>3.0.1</karaf.version>
     <feature.test.version>0.7.0-SNAPSHOT</feature.test.version>
     <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
     <surefire.version>2.16</surefire.version>
@@ -96,6 +95,20 @@
       <type>xml</type>
     </dependency>
 -->
+      <!-- Add Pax Exam -->
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam</artifactId>
+      <version>${exam.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-karaf</artifactId>
+      <version>${exam.version}</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
   <build>
     <resources>