Cleanup versions across modules

This finishes up the audit of pom.xml files to eliminate
superfluous version declarations.

Change-Id: Id7c671ad1c16ffb7db15709709fec9d933c65170
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index b96768a9d8f117b9c4f532098e80d7804bfed470..9563215555d6a15f5bca71d7af74723b28e6ff64 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -24,6 +24,13 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>5.0.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
@@ -34,14 +41,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-artifacts</artifactId>
-        <version>5.0.1</version>
+        <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/cds-access-api/pom.xml b/opendaylight/md-sal/cds-access-api/pom.xml
index 1c7a0f8ee196c03b3d770027ba7a026796e1b5cb..95def9325690cdfe6e94eefa5d1e98c31b46a696 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/pom.xml
+++ b/opendaylight/md-sal/cds-access-api/pom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.controller</groupId>
         <artifactId>mdsal-parent</artifactId>
@@ -11,7 +10,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>cds-access-api</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/opendaylight/md-sal/cds-access-client/pom.xml b/opendaylight/md-sal/cds-access-client/pom.xml
index 175d5541e63dcf56505a9b9f16af7cf027cbcc6d..896b444adbd6306e15747b3bd5e0815d9c300081 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/pom.xml
+++ b/opendaylight/md-sal/cds-access-client/pom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.controller</groupId>
         <artifactId>mdsal-parent</artifactId>
@@ -11,7 +10,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>cds-access-client</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/opendaylight/md-sal/cds-dom-api/pom.xml b/opendaylight/md-sal/cds-dom-api/pom.xml
index 15dad05ff484f35fac755468b5290b2ab53963bb..8d5340dc317ba5b60b92e086faa2e332f99e0081 100644 (file)
--- a/opendaylight/md-sal/cds-dom-api/pom.xml
+++ b/opendaylight/md-sal/cds-dom-api/pom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.controller</groupId>
         <artifactId>mdsal-parent</artifactId>
@@ -11,7 +10,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>cds-dom-api</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index 0c01721d764b99fbd957497ec90c04f77e5e1f42..39ae9404db648157ce95a9c68ddc6b73727cea9f 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/pom.xml
@@ -8,14 +8,14 @@ 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">
-
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
     <version>7.0.1</version>
     <relativePath/>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>mdsal-it-base</artifactId>
   <version>2.0.0-SNAPSHOT</version>
@@ -33,7 +33,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/messagebus-api/pom.xml b/opendaylight/md-sal/messagebus-api/pom.xml
index c3a4916fdd5a2cdcbe6ba05bf66afd57eed829d9..4549ecc979d800fe26e5ee0598ef1d77b3eee42b 100644 (file)
--- a/opendaylight/md-sal/messagebus-api/pom.xml
+++ b/opendaylight/md-sal/messagebus-api/pom.xml
@@ -10,7 +10,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
          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.controller</groupId>
         <artifactId>mdsal-parent</artifactId>
@@ -20,7 +19,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>messagebus-api</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
 
@@ -53,5 +51,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             </plugin>
         </plugins>
     </build>
-
 </project>

diff --git a/opendaylight/md-sal/messagebus-impl/pom.xml b/opendaylight/md-sal/messagebus-impl/pom.xml
index 330ac154179b86617a35e9eec5e6376024958437..aa4f016e29957ca3097e7e07e1f0839af0d9077e 100644 (file)
--- a/opendaylight/md-sal/messagebus-impl/pom.xml
+++ b/opendaylight/md-sal/messagebus-impl/pom.xml
@@ -10,7 +10,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
          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.controller</groupId>
         <artifactId>mdsal-parent</artifactId>
@@ -19,7 +18,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
-    <version>2.0.0-SNAPSHOT</version>
     <artifactId>messagebus-impl</artifactId>
     <name>${project.artifactId}</name>
     <packaging>bundle</packaging>
@@ -42,5 +40,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>messagebus-spi</artifactId>
         </dependency>
     </dependencies>
-
 </project>

diff --git a/opendaylight/md-sal/messagebus-spi/pom.xml b/opendaylight/md-sal/messagebus-spi/pom.xml
index 4e11e9d9dbf82d38967c8845ebf98f7a3c709471..808b1491d5f79ddaecf5acfb2938a53d24788f61 100644 (file)
--- a/opendaylight/md-sal/messagebus-spi/pom.xml
+++ b/opendaylight/md-sal/messagebus-spi/pom.xml
@@ -1,3 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+
+This program and the accompanying materials are made available under the
+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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -9,7 +17,6 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>messagebus-spi</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/opendaylight/md-sal/messagebus-util/pom.xml b/opendaylight/md-sal/messagebus-util/pom.xml
index be0ec1f5ac15803e5fa87c8b99c5e722e86cadd8..60c430e257a48c53df700f88a5e174b13c0c08da 100644 (file)
--- a/opendaylight/md-sal/messagebus-util/pom.xml
+++ b/opendaylight/md-sal/messagebus-util/pom.xml
@@ -20,7 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>messagebus-util</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
 
@@ -44,11 +43,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
               <version>2.4</version>
               <scope>test</scope>
         </dependency>
-        <dependency>
-              <groupId>org.mockito</groupId>
-              <artifactId>mockito-core</artifactId>
-              <scope>test</scope>
-        </dependency>
     </dependencies>
-
 </project>

diff --git a/opendaylight/md-sal/sal-akka-raft-example/pom.xml b/opendaylight/md-sal/sal-akka-raft-example/pom.xml
index 43a9a4ea611b3565d57d6a9a84968c2fba6ea5b1..df712f505e4456f45cb616ad6f6f654fbd23d6f0 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft-example/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft-example/pom.xml
@@ -17,7 +17,6 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-akka-raft-example</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -53,5 +52,4 @@
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:Architecture:Clustering</url>
   </scm>
-
 </project>

diff --git a/opendaylight/md-sal/sal-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml
index 1e6e047dab212e81e958df63f2ce077e42911a5a..1639fbfe13abb0180712cc1e4300b50896456c91 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft/pom.xml
@@ -10,7 +10,6 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-akka-raft</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -18,62 +17,48 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-clustering-commons</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-actor_2.13</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-cluster_2.13</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-persistence_2.13</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-remote_2.13</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-testkit_2.13</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>akka-slf4j_2.13</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-slf4j_2.13</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
     </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>org.awaitility</groupId>
-      <artifactId>awaitility</artifactId>
+      <groupId>com.typesafe.akka</groupId>
+      <artifactId>akka-testkit_2.13</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -95,7 +80,6 @@
 
   <build>
     <plugins>
-
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -108,7 +92,6 @@
           </instructions>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -129,5 +112,4 @@
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:Architecture:Clustering</url>
   </scm>
-
 </project>

diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
index 10c857490358809d6ac2059b2a1ac2cbb7b6ca23..e09d4409dc6378fa7df9e7a7e7729031a964d582 100644 (file)
--- a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
+++ b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
@@ -17,11 +17,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </parent>
 
     <artifactId>sal-akka-segmented-journal</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
-
         <!-- Akka -->
         <dependency>
             <groupId>com.typesafe.akka</groupId>
@@ -107,5 +105,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <tag>HEAD</tag>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:Architecture:Clustering</url>
     </scm>
-
 </project>

diff --git a/opendaylight/md-sal/sal-cluster-admin-api/pom.xml b/opendaylight/md-sal/sal-cluster-admin-api/pom.xml
index 307f3f43642fdda2b9d9ba77b0082f39709d7fb2..1f833fbdb22bb834eeac99721211c4d33b406cb1 100644 (file)
--- a/opendaylight/md-sal/sal-cluster-admin-api/pom.xml
+++ b/opendaylight/md-sal/sal-cluster-admin-api/pom.xml
@@ -10,7 +10,6 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-cluster-admin-api</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -19,5 +18,4 @@
       <artifactId>cds-access-api</artifactId>
     </dependency>
   </dependencies>
-
 </project>

diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
index ef8da2d21054378949cf237b8e6ad32ee6b7dfb1..15c54bd1591de2d3faec487c04d4937869c239cd 100644 (file)
--- a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
+++ b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
@@ -10,7 +10,6 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-cluster-admin-impl</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -18,12 +17,8 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-cluster-admin-api</artifactId>
     </dependency>
+
     <!-- Tests -->
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
@@ -39,7 +34,7 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-distributed-datastore</artifactId>
       <type>test-jar</type>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -49,7 +44,6 @@
     <dependency>
       <groupId>org.opendaylight.controller.samples</groupId>
       <artifactId>clustering-it-model</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml
index 3d0730da04f9c0ec8886cb6f3f4556f816582262..37fbb0d4421eab011c3733700ff17d9fddd478b5 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml
@@ -9,7 +9,6 @@
   </parent>
 
   <artifactId>sal-clustering-commons</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -19,11 +18,6 @@
       <artifactId>xmlunit-legacy</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>

diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml
index 01c55fdc3323072ba76a1c03c9062f84d2031d7d..c0c0c7f7c6f3648c752ee41bf0daba29e47f3d21 100644 (file)
--- a/opendaylight/md-sal/sal-common-util/pom.xml
+++ b/opendaylight/md-sal/sal-common-util/pom.xml
@@ -10,7 +10,6 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-common-util</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
index 3b019d3c5ca79edf5f16c180e9cc85609cb1915b..e88b6231fc111cfa30a85b2a27d9a9e36edfa311 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@ -9,7 +9,6 @@
   </parent>
 
   <artifactId>sal-distributed-datastore</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/opendaylight/md-sal/sal-distributed-eos/pom.xml b/opendaylight/md-sal/sal-distributed-eos/pom.xml
index aa1af28777b54655377a2b7925df3e49c95058b6..e1629b2eca3e9a83d727e94e84cef40b47df1327 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-eos/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-eos/pom.xml
@@ -9,7 +9,6 @@
   </parent>
 
   <artifactId>sal-distributed-eos</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -52,7 +51,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-distributed-datastore</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
index 58e4d1cfcb5db361f8f4ef57249a8fdc9f878adc..229ab3ef441fd1cdcec1cbe9ef7c6f07e9483cc5 100644 (file)
--- a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
@@ -10,7 +10,6 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-dummy-distributed-datastore</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
index 37ddc1e1bf0b488ef14dfabdce1463ae6881b811..b9b90ffa3f5a80dde3c8ffdd56f06df8b54704e6 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@ -10,7 +10,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-remoterpc-connector</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
@@ -90,11 +89,6 @@
             <artifactId>scala-library</artifactId>
         </dependency>
         <!-- Test Dependencies -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

diff --git a/opendaylight/md-sal/sal-test-model/pom.xml b/opendaylight/md-sal/sal-test-model/pom.xml
index 7d6fa6166a4ec670c8a91ef08b933635823d4ff5..d335cc2b6f5ce3ddc9768b5e7f6b6d6fd0c05d01 100644 (file)
--- a/opendaylight/md-sal/sal-test-model/pom.xml
+++ b/opendaylight/md-sal/sal-test-model/pom.xml
@@ -12,7 +12,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-test-model</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
index acbd7fa23f13f2c9f9dac5172cf4d807932f203d..63a51f216ff924333ad30047a661e2ef39146c5c 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
@@ -10,10 +10,20 @@
     </parent>
 
     <groupId>org.opendaylight.controller.samples</groupId>
-    <version>2.0.0-SNAPSHOT</version>
     <artifactId>clustering-it-model</artifactId>
     <packaging>bundle</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>yang-ext</artifactId>
+        </dependency>
+    </dependencies>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -30,14 +40,4 @@
             </plugins>
         </pluginManagement>
     </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>yang-ext</artifactId>
-        </dependency>
-    </dependencies>
 </project>

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
index 442270f47987e3b3498399fca1f602750c82fe59..0579dd032e98a7a39420cd775ab972a44a9d32fd 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
@@ -10,7 +10,6 @@
 
     <groupId>org.opendaylight.controller.samples</groupId>
     <artifactId>clustering-it-provider</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
index e1da07ae50fb4a17088f94344701a1c9c1e7029e..2a4e22a7b9d708701e0dcd21e2f00147186c0ad5 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
@@ -10,14 +10,12 @@
 
   <groupId>org.opendaylight.controller.samples</groupId>
   <artifactId>sample-toaster-consumer</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>sample-toaster</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml
index 402f4a67d0e856573d0aebdaee3f9232c828a5de..cbbd9ee50ab79bb7044ba850fdfcbbca14b28663 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-provider/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml
@@ -10,14 +10,12 @@
 
   <groupId>org.opendaylight.controller.samples</groupId>
   <artifactId>sample-toaster-provider</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>sample-toaster</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>

diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml
index 9dc3778d5620202879e9dbf2db633681215e14d3..505e568d3d1edd300f24d7cf1e99d8a80396a1f5 100644 (file)
--- a/opendaylight/md-sal/samples/toaster/pom.xml
+++ b/opendaylight/md-sal/samples/toaster/pom.xml
@@ -10,7 +10,6 @@
   </parent>
 
   <groupId>org.opendaylight.controller.samples</groupId>
-  <version>2.0.0-SNAPSHOT</version>
   <artifactId>sample-toaster</artifactId>
   <packaging>bundle</packaging>
 

diff --git a/opendaylight/model/model-topology/pom.xml b/opendaylight/model/model-topology/pom.xml
index c8ffed0e75fbd0345c1922ffe462ba1b5a720168..52897a46ab659fe44db702c91aa2ad04fba1850b 100644 (file)
--- a/opendaylight/model/model-topology/pom.xml
+++ b/opendaylight/model/model-topology/pom.xml
@@ -11,22 +11,20 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>6.0.0</version>
-        <relativePath/>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../md-sal/parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller.model</groupId>
     <artifactId>model-topology</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>