Bump versions by x.y.(z+1)

[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 3a292a8f0ee614b9fe39d87a2bff48506c7a0cd5..e085e490086b4e2a922f5b68983698524f60eda0 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- vi: set et smarttab sw=4 tabstop=4: --><!--
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--

 Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
 
 This program and the accompanying materials are made available under the
 Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
 
 This program and the accompanying materials are made available under the


@@ -9,19 +10,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>
 <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.4.0-SNAPSHOT</version>
-    <relativePath>../../config/config-parent</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>2.0.7</version>
+    <relativePath/>

   </parent>
   <modelVersion>4.0.0</modelVersion>
   </parent>
   <modelVersion>4.0.0</modelVersion>

+  <groupId>org.opendaylight.controller</groupId>

   <artifactId>mdsal-it-parent</artifactId>
   <artifactId>mdsal-it-parent</artifactId>

-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.6.4-SNAPSHOT</version>

   <packaging>pom</packaging>
   <properties>
   <packaging>pom</packaging>
   <properties>

-    <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+    <mdsal.version>1.6.4-SNAPSHOT</mdsal.version>
+    <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>

     <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
     <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>

-    <karaf.distro.version>1.6.0-SNAPSHOT</karaf.distro.version>
+    <karaf.distro.version>2.0.7</karaf.distro.version>

     <karaf.distro.type>zip</karaf.distro.type>
     <karaf.keep.unpack>false</karaf.keep.unpack>
   </properties>
     <karaf.distro.type>zip</karaf.distro.type>
     <karaf.keep.unpack>false</karaf.keep.unpack>
   </properties>


@@ -57,6 +60,41 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam</artifactId>
     </dependency>
         <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>
     <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-aether</artifactId>


@@ -83,7 +121,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>org.mockito</groupId>
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>org.mockito</groupId>

-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>

       <scope>test</scope>
     </dependency>
   </dependencies>
       <scope>test</scope>
     </dependency>
   </dependencies>