X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmdsal-it-parent%2Fpom.xml;h=66b4bde8d160b9e6274970aa3d5260b92b34742b;hp=468743dbcecb0007a5f520cb541b70556f385bae;hb=99885ce176edfb3b9a91be8fcf5f3fd01019a52c;hpb=14c92df74247c884a43c5aaea2f154992b0ec798

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 468743dbce..66b4bde8d1 100644
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -13,17 +13,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>6.0.0</version>
+    <version>7.0.6</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>mdsal-it-parent</artifactId>
-  <version>1.11.0-SNAPSHOT</version>
+  <version>2.0.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
-    <mdsal.version>1.11.0-SNAPSHOT</mdsal.version>
     <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
     <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
     <karaf.distro.type>zip</karaf.distro.type>
@@ -34,8 +33,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <artifactId>controller-artifacts</artifactId>
+        <version>2.0.5-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -46,7 +45,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>mdsal-it-base</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
 
     <!-- Dependencies for pax exam karaf container -->
@@ -83,11 +81,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-aether</artifactId>
     </dependency>
-    <dependency>
-        <groupId>javax.inject</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>1</version>
-    </dependency>
     <dependency>
         <groupId>org.apache.karaf.features</groupId>
         <artifactId>org.apache.karaf.features.core</artifactId>
@@ -113,7 +106,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <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>