From: Martin Bobak <mbobak@cisco.com>
Date: Tue, 10 Dec 2013 19:07:29 +0000 (+0100)
Subject: removed parent dependency on pax-exam-container-native
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~206^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=fe83b9d0320e1cba9eae662a93760fa15718279d;hp=43b37a609662f705d2dd701cb8b7c479144d2ef1

removed parent dependency on pax-exam-container-native

Change-Id: I366e22d2f36d6f5657f8f077d7661b2b3b4b98a3
Signed-off-by: Martin Bobak <mbobak@cisco.com>
---

diff --git a/opendaylight/commons/integrationtest/pom.xml b/opendaylight/commons/integrationtest/pom.xml
index 5e101ebd28..fe5aa473a6 100644
--- 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 b34621d02d..6f1b2c0c10 100644
--- 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 6525fa078e..7391139d0f 100644
--- 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 d4d3d1c857..5dfa1632f7 100644
--- 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>