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

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

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index 8e5c613d5b92c3fa7768183ab698c98601336be6..7e5234a505ac0298093b990f6ada40970a75869a 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/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


@@ -11,17 +12,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>2.0.1</version>
+    <version>3.1.4</version>

     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>mdsal-it-base</artifactId>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>mdsal-it-base</artifactId>

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

   <packaging>bundle</packaging>
   <packaging>bundle</packaging>

-  <properties>
-    <config.version>0.7.0-SNAPSHOT</config.version>
-  </properties>
+

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


@@ -33,12 +32,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       </dependency>
     </dependencies>
   </dependencyManagement>
       </dependency>
     </dependencies>
   </dependencyManagement>

+

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

-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-it-base</artifactId>
-      <version>${config.version}</version>
-      <scope>compile</scope>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>opendaylight-karaf-empty</artifactId>
+      <type>zip</type>

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


@@ -60,6 +59,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>pax-exam</artifactId>
         <scope>compile</scope>
     </dependency>
         <artifactId>pax-exam</artifactId>
         <scope>compile</scope>
     </dependency>

+    <dependency>
+        <groupId>org.ops4j.pax.tipi</groupId>
+        <artifactId>org.ops4j.pax.tipi.junit</artifactId>
+        <version>4.12.0.1</version>
+        <scope>runtime</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.tipi</groupId>
+        <artifactId>org.ops4j.pax.tipi.hamcrest.core</artifactId>
+        <version>1.3.0.1</version>
+        <scope>runtime</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>


@@ -68,7 +79,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
         <groupId>javax.inject</groupId>
         <artifactId>javax.inject</artifactId>
     <dependency>
         <groupId>javax.inject</groupId>
         <artifactId>javax.inject</artifactId>

-        <version>1</version>

         <scope>compile</scope>
     </dependency>
     <dependency>
         <scope>compile</scope>
     </dependency>
     <dependency>