Bump upstream versions

[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 6dbd537f7e3fd61ddf67c2de9f8a23ac42dc3874..c7c3c52010f577fb88adc3796fd137c956db0cd8 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,32 +8,36 @@ 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>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
 
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>1.9.0</version>
+    <version>9.0.13</version>

     <relativePath/>
   </parent>
     <relativePath/>
   </parent>

-  <modelVersion>4.0.0</modelVersion>
+

   <groupId>org.opendaylight.controller</groupId>
   <artifactId>mdsal-it-parent</artifactId>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>mdsal-it-parent</artifactId>

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

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

+

   <properties>
   <properties>

-    <mdsal.version>1.6.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.9.0</karaf.distro.version>

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

+
+    <!-- FIXME: Remove this -->
+    <odlparent.modernizer.enforce>false</odlparent.modernizer.enforce>

   </properties>
   </properties>

+

   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>

-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <artifactId>controller-artifacts</artifactId>
+        <version>4.0.9-SNAPSHOT</version>

         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <type>pom</type>
         <scope>import</scope>
       </dependency>


@@ -43,7 +48,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>mdsal-it-base</artifactId>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>mdsal-it-base</artifactId>

-      <version>${mdsal.version}</version>

     </dependency>
 
     <!-- Dependencies for pax exam karaf container -->
     </dependency>
 
     <!-- Dependencies for pax exam karaf container -->


@@ -60,13 +64,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>pax-exam</artifactId>
     </dependency>
     <dependency>
         <artifactId>pax-exam</artifactId>
     </dependency>
     <dependency>

-        <groupId>org.ops4j.pax.url</groupId>
-        <artifactId>pax-url-aether</artifactId>
+        <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>
     </dependency>
     <dependency>

-        <groupId>javax.inject</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>1</version>
+        <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>
     <dependency>
         <groupId>org.apache.karaf.features</groupId>
     </dependency>
     <dependency>
         <groupId>org.apache.karaf.features</groupId>


@@ -75,7 +91,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
         <groupId>org.osgi</groupId>
     </dependency>
     <dependency>
         <groupId>org.osgi</groupId>

-        <artifactId>org.osgi.core</artifactId>
+        <artifactId>osgi.core</artifactId>

     </dependency>
     <dependency>
         <groupId>junit</groupId>
     </dependency>
     <dependency>
         <groupId>junit</groupId>


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

+      <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+              <!-- Overridden to have TCP channel support -->
+          <version>3.0.0-M5</version>
+          <configuration>
+              <!-- Overridden to fix corruption, where the process would hang after test -->
+              <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
+              <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>


@@ -156,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>