Unify version management: Topology component

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

diff --git a/topology/api-config/pom.xml b/topology/api-config/pom.xml
index 31bf130136313fa8dc6414c72799323e22d8cc1a..d1d88f11dbfe0807344bc8d7347e23fe0aff2208 100644 (file)
--- a/topology/api-config/pom.xml
+++ b/topology/api-config/pom.xml
@@ -15,15 +15,13 @@
    </prerequisites>
 
    <dependencies>
-      <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>config-api</artifactId>
-         <version>${controller.config.version}</version>
-      </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>topology-api</artifactId>
-         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.opendaylight.controller</groupId>
+         <artifactId>config-api</artifactId>
       </dependency>
    </dependencies>
 

diff --git a/topology/api/pom.xml b/topology/api/pom.xml
index 99fdd1723172955dcd89a56245d723bc85b84c54..9361af78c25e7ff58a223a453e21f27d0124095a 100644 (file)
--- a/topology/api/pom.xml
+++ b/topology/api/pom.xml
@@ -22,17 +22,14 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>concepts</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>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>

diff --git a/topology/pom.xml b/topology/pom.xml
index ced74f0053d38c95363d1e97ac4defac37f7cf92..7c9106d0ae1fcd90f08bfa875196eb2661235390 100644 (file)
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -19,7 +19,32 @@
        <modules>
         <module>api</module>
         <module>api-config</module>
-               <module>tunnel-api</module>
         <module>segment-routing</module>
+               <module>tunnel-api</module>
     </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>topology-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>topology-api-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>topology-segment-routing</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/topology/segment-routing/pom.xml b/topology/segment-routing/pom.xml
index 9823568c3a3a1f927f583503e13ecf33c7c2d59a..db22878da2c1d2a37c351d1fde62b1425be120c4 100644 (file)
--- a/topology/segment-routing/pom.xml
+++ b/topology/segment-routing/pom.xml
@@ -22,17 +22,14 @@
                <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>
 

diff --git a/topology/tunnel-api/pom.xml b/topology/tunnel-api/pom.xml
index d0ea10b744ceffb8842c53321a502ff4a13e4b20..bd5f501edaeb21d5fc0e737eab6efdf8be20551b 100644 (file)
--- a/topology/tunnel-api/pom.xml
+++ b/topology/tunnel-api/pom.xml
@@ -22,17 +22,14 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>topology-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>