Merge "removed parent dependency on pax-exam-container-native"

diff --git a/opendaylight/commons/integrationtest/pom.xml b/opendaylight/commons/integrationtest/pom.xml
index 5e101ebd2856e8706e4a0b4d422c1d146a2f35e7..fe5aa473a69c18090552f5e7c7fdf94971b30b34 100644 (file)
--- a/opendaylight/commons/integrationtest/pom.xml
+++ b/opendaylight/commons/integrationtest/pom.xml
@@ -59,11 +59,6 @@
       <artifactId>junit</artifactId>
     </dependency>
     <!-- Add Pax Exam -->
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-container-native</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit4</artifactId>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index b34621d02d6f8da7a7b24e6e60cff5e641b9a8d4..6f1b2c0c10629053d96589e581d221be53a184a5 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -120,6 +120,7 @@
         <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
         <sonar.branch>${user.name}-private-view</sonar.branch>
         <sonar.language>java</sonar.language>
+        <exam.version>3.0.0</exam.version>
     </properties>
 
     <pluginRepositories>

diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index 6525fa078ed991ed26bed4e9491b79b4dd4ebe95..7391139d0f11c0c63eace374f08b97356e0b5918 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -13,7 +13,6 @@
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
     </scm>
-
     <build>
         <plugins>
             <plugin>
@@ -49,6 +48,12 @@
     </build>
 
     <dependencies>
+        <dependency>
+          <groupId>org.ops4j.pax.exam</groupId>
+          <artifactId>pax-exam-container-native</artifactId>
+          <scope>test</scope>
+          <version>${exam.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/opendaylight/topologymanager/integrationtest/pom.xml b/opendaylight/topologymanager/integrationtest/pom.xml
index d4d3d1c85764dd6be1439404cd6447c5f83d8d25..5dfa1632f74c4d323cb87e8cbe8bb8885ada9e35 100644 (file)
--- a/opendaylight/topologymanager/integrationtest/pom.xml
+++ b/opendaylight/topologymanager/integrationtest/pom.xml
@@ -18,6 +18,12 @@
   <artifactId>topologymanager.integrationtest</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <dependencies>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-native</artifactId>
+      <version>${exam.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>protocol_plugins.stub</artifactId>