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 aec6c47d5b47cd6370c0fd6d6bcb4355b36ed0cf..1529d2387018c873227fc68627a86754aa84e233 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


@@ -7,24 +8,28 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 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">
 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">

+  <modelVersion>4.0.0</modelVersion>

 
   <parent>
 
   <parent>

-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath>../../config/config-parent</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>6.0.4</version>
+    <relativePath/>

   </parent>
   </parent>

-  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.opendaylight.controller</groupId>

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

-  <version>1.6.0-SNAPSHOT</version>
+  <version>1.12.0-SNAPSHOT</version>

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

+

   <properties>
   <properties>

+    <mdsal.version>1.12.0-SNAPSHOT</mdsal.version>

     <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
     <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
     <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
     <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>

-    <karaf.distro.version>1.8.0-Carbon</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>

+

   <dependencyManagement>
     <dependencies>
       <dependency>
   <dependencyManagement>
     <dependencies>
       <dependency>


@@ -57,6 +62,23 @@ 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>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-extender-service</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-inject</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-invoker-junit</artifactId>
+    </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>


@@ -89,6 +111,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </dependencies>
   <build>
     <plugins>
   </dependencies>
   <build>
     <plugins>

+      <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+              <systemPropertyVariables>
+                <!-- CONTROLLER-1799: Use the same repository for Pax Exam as is used for Maven -->
+                <org.ops4j.pax.url.mvn.localRepository>${settings.localRepository}</org.ops4j.pax.url.mvn.localRepository>
+              </systemPropertyVariables>
+          </configuration>
+      </plugin>

       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>


@@ -154,7 +185,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
            <configuration>
             <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
             <groupId>org.opendaylight.controller</groupId>
            <configuration>
             <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
             <groupId>org.opendaylight.controller</groupId>

-            <includeArtifactIds>config-it-base,mdsal-it-base</includeArtifactIds>
+            <includeArtifactIds>mockito-core,objenesis,mdsal-it-base</includeArtifactIds>

             <excludes>META-INF\/**</excludes>
             <ignorePermissions>false</ignorePermissions>
            </configuration>
             <excludes>META-INF\/**</excludes>
             <ignorePermissions>false</ignorePermissions>
            </configuration>