Unify versions: Programming and its dependencies

Change-Id: I2da294ecfec7aeed324505e2e7f1be043952a90a
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/programming/api/pom.xml b/programming/api/pom.xml
index d47d269044cf636d95c6f6677ffb1b9837e186cf..2d0dd73423fb267c3b5bac976f66b959635a89ad 100644 (file)
--- a/programming/api/pom.xml
+++ b/programming/api/pom.xml
@@ -22,12 +22,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yang.binding.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>${yangtools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>

diff --git a/programming/impl-config/pom.xml b/programming/impl-config/pom.xml
index 9e5642f631ca071134b5249e766e73ea65378e33..9920d105f0e03118fec5fdeec679a45c114aeb53 100644 (file)
--- a/programming/impl-config/pom.xml
+++ b/programming/impl-config/pom.xml
@@ -19,17 +19,14 @@
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>config-api</artifactId>
-         <version>${controller.config.version}</version>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>programming-spi-config</artifactId>
-         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>programming-impl</artifactId>
-         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.opendaylight.controller</groupId>

diff --git a/programming/impl/pom.xml b/programming/impl/pom.xml
index de5a59cddcab732b1908bb3044faa7deca749ea1..1044f3f77415c89514527f1947f60abe517a6d07 100644 (file)
--- a/programming/impl/pom.xml
+++ b/programming/impl/pom.xml
@@ -22,12 +22,10 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>programming-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>programming-spi</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -38,28 +36,24 @@
                <dependency>
                        <groupId>com.google.code.findbugs</groupId>
                        <artifactId>jsr305</artifactId>
-                       <version>2.0.1</version>
                </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <version>${guava.version}</version>
                </dependency>
         <dependency>
                        <groupId>io.netty</groupId>
                        <artifactId>netty-common</artifactId>
-            <version>${netty.version}</version>
-               </dependency>
+        </dependency>
+
+        <!-- Testing dependencies -->
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>mockito-configuration</artifactId>
-            <version>${project.version}</version>
-                       <scope>test</scope>
         </dependency>
        </dependencies>
 

diff --git a/programming/pom.xml b/programming/pom.xml
index 87ce70a29d09c6714606a0715a0bf4cc89ee8e6a..729112fe856e3b4ae5ed14c6b256e66cfe8dff06 100644 (file)
--- a/programming/pom.xml
+++ b/programming/pom.xml
@@ -25,4 +25,57 @@
         <module>topology-api</module>
                <module>tunnel-api</module>
     </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>programming-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>programming-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>programming-impl-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>programming-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>programming-spi-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>programming-topology-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>programming-tunnel-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <!-- Stuff outside of this component -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>topology-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>topology-tunnel-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
 </project>

diff --git a/programming/spi/pom.xml b/programming/spi/pom.xml
index b9239093a6926f6a6aa81a3d91936ce3a37b787a..759665990323de177c88329e79e39a56b944492e 100644 (file)
--- a/programming/spi/pom.xml
+++ b/programming/spi/pom.xml
@@ -22,13 +22,11 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>programming-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
                        <groupId>io.netty</groupId>
                        <artifactId>netty-common</artifactId>
-            <version>${netty.version}</version>
                </dependency>
 
         <dependency>
@@ -39,28 +37,20 @@
                <dependency>
                        <groupId>com.google.code.findbugs</groupId>
                        <artifactId>jsr305</artifactId>
-                       <version>2.0.1</version>
                </dependency>
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <version>${guava.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>${guava.version}</version>
-               </dependency>
+        </dependency>
+
+        <!-- Testing dependencies -->
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>mockito-configuration</artifactId>
-            <version>${project.version}</version>
-                       <scope>test</scope>
         </dependency>
        </dependencies>
 

diff --git a/programming/topology-api/pom.xml b/programming/topology-api/pom.xml
index a85800af63ce67ccc1316a366c89d0707799f876..00d69fd43dbb0a22e0fd373c703d7496ea39c0f3 100644 (file)
--- a/programming/topology-api/pom.xml
+++ b/programming/topology-api/pom.xml
@@ -22,22 +22,20 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>programming-api</artifactId>
-            <version>${project.version}</version>
-               </dependency>
+        </dependency>
+
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>topology-api</artifactId>
-            <version>${project.version}</version>
-               </dependency>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yang.binding.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>${yangtools.version}</version>
         </dependency>
        </dependencies>
 

diff --git a/programming/tunnel-api/pom.xml b/programming/tunnel-api/pom.xml
index 6e2001bc0851b362fac3a9683e3f029df600d714..2c88d83e1139b19212348bfc0b1b4986b16e05ac 100644 (file)
--- a/programming/tunnel-api/pom.xml
+++ b/programming/tunnel-api/pom.xml
@@ -22,27 +22,22 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>programming-topology-api</artifactId>
-            <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>topology-api</artifactId>
-            <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>topology-tunnel-api</artifactId>
-            <version>${project.version}</version>
                </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yang.binding.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>${yangtools.version}</version>
         </dependency>
        </dependencies>