Bump karaf-empty dependency version to 2.0.4

[controller.git] / opendaylight / md-sal / mdsal-it-parent / pom.xml

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index de95ba7d711e00ca22a4ac3fc98714addf71e388..fadfb18b3d99b3d3dd3f429ab2d8ab12f3027e35 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -9,19 +9,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../../config/config-parent</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>2.0.4</version>
+    <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
+  <groupId>org.opendaylight.controller</groupId>
   <artifactId>mdsal-it-parent</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <properties>
-    <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+    <mdsal.version>1.7.0-SNAPSHOT</mdsal.version>
+    <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
     <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-    <karaf.distro.version>1.7.0-SNAPSHOT</karaf.distro.version>
+    <karaf.distro.version>2.0.4</karaf.distro.version>
     <karaf.distro.type>zip</karaf.distro.type>
     <karaf.keep.unpack>false</karaf.keep.unpack>
   </properties>
@@ -57,6 +59,41 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam</artifactId>
     </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-features</artifactId>
+        <type>xml</type>
+
+        <!-- FIXME: remove version declaration and scope once odlparent has this -->
+        <version>${exam.version}</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-extender-service</artifactId>
+
+        <!-- FIXME: remove version declaration and scope once odlparent has this -->
+        <version>${exam.version}</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-inject</artifactId>
+
+        <!-- FIXME: remove version declaration and scope once odlparent has this -->
+        <version>${exam.version}</version>
+        <scope>test</scope>
+    </dependency>
+
+    <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-invoker-junit</artifactId>
+
+        <!-- FIXME: remove version declaration and scope once odlparent has this -->
+        <version>${exam.version}</version>
+        <scope>test</scope>
+    </dependency>
+
     <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-aether</artifactId>
@@ -83,7 +120,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>