From ce90e5e3784c8623a62d3e84b849841630269148 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 13 May 2021 13:56:41 +0200
Subject: [PATCH] Reduce project.version proliferation

Rely on netconf-artifacts to propagate versions around the build
reactor, so that we are always self-consistent.

Change-Id: I1e680c649b97dad16a90d57d83b89502eadb4b6e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../features-netconf-connector/pom.xml         | 18 ++++++++++++------
 features/restconf/features-restconf/pom.xml    | 17 ++++++++++++-----
 features/yanglib/features-yanglib/pom.xml      | 13 ++++++++++++-
 netconf/netconf-topology-impl/pom.xml          | 12 ------------
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index e2e8c96d3f..4ffe9df0b8 100644
--- a/features/netconf-connector/features-netconf-connector/pom.xml
+++ b/features/netconf-connector/features-netconf-connector/pom.xml
@@ -27,46 +27,52 @@
     <skip.karaf.featureTest>true</skip.karaf.featureTest>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>${project.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-clustered-topology</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-connector</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-connector-all</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-callhome-ssh</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-console</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-topology</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index 0c0ad8b1c7..97d8319d77 100644
--- a/features/restconf/features-restconf/pom.xml
+++ b/features/restconf/features-restconf/pom.xml
@@ -21,39 +21,46 @@
   <version>2.0.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>${project.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-mdsal-apidocs</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-restconf</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-restconf-all</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-restconf-nb-bierman02</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-restconf-nb-rfc8040</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml
index cfe5f4c7ee..a39d48076b 100644
--- a/features/yanglib/features-yanglib/pom.xml
+++ b/features/yanglib/features-yanglib/pom.xml
@@ -22,11 +22,22 @@
     <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netconf-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-yanglib</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/netconf/netconf-topology-impl/pom.xml b/netconf/netconf-topology-impl/pom.xml
index 0c9523e8cb..16a5d5f992 100644
--- a/netconf/netconf-topology-impl/pom.xml
+++ b/netconf/netconf-topology-impl/pom.xml
@@ -21,18 +21,6 @@
     <description>Simple NETCONF topology</description>
     <packaging>bundle</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-- 
2.36.6