From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 27 Apr 2020 20:17:38 +0000 (+0200)
Subject: Update feature version declarations
X-Git-Tag: v2.0.0~8
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=d22448e283c4e4f04387ecf91e10e31eb0ddf388

Update feature version declarations

We do not need to override parent's version, as it matches our
version. Also trim down use of project.version where the artifact
is already declared in artifacts.

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

diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml
index 6875de8c48..db0d9fda89 100644
--- a/features/features-controller-experimental/pom.xml
+++ b/features/features-controller-experimental/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>feature-repo-parent</artifactId>
@@ -28,7 +27,7 @@
             <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/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml
index 5405fc3ef8..41aa657373 100644
--- a/features/features-controller-testing/pom.xml
+++ b/features/features-controller-testing/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>feature-repo-parent</artifactId>
@@ -28,7 +27,7 @@
             <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/features/features-controller/pom.xml b/features/features-controller/pom.xml
index 118e931889..4cc47ae5b7 100644
--- a/features/features-controller/pom.xml
+++ b/features/features-controller/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>feature-repo-parent</artifactId>
@@ -28,7 +27,7 @@
             <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/features/odl-clustering-test-app/pom.xml b/features/odl-clustering-test-app/pom.xml
index b29b110fa2..ec7884d78f 100644
--- a/features/odl-clustering-test-app/pom.xml
+++ b/features/odl-clustering-test-app/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,7 +17,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-clustering-test-app</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <dependencies>
@@ -37,13 +35,10 @@
         <dependency>
             <groupId>org.opendaylight.controller.samples</groupId>
             <artifactId>clustering-it-model</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.samples</groupId>
             <artifactId>clustering-it-provider</artifactId>
-            <version>${project.version}</version>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/features/odl-controller-exp-messagebus/pom.xml b/features/odl-controller-exp-messagebus/pom.xml
index 0a8e67d220..1d3299ef6a 100644
--- a/features/odl-controller-exp-messagebus/pom.xml
+++ b/features/odl-controller-exp-messagebus/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,7 +17,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-controller-exp-messagebus</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Controller :: Experimental :: Message Bus</name>
     <description>Experimental Message Bus Collector</description>
diff --git a/features/odl-controller-exp-netty-config/pom.xml b/features/odl-controller-exp-netty-config/pom.xml
index e3ad8ee99d..a8dc875fc0 100644
--- a/features/odl-controller-exp-netty-config/pom.xml
+++ b/features/odl-controller-exp-netty-config/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,7 +17,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-controller-exp-netty-config</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Controller :: Experimental :: Netty Configuration</name>
     <description>Common configuration for Netty resources</description>
diff --git a/features/odl-controller-mdsal-common/pom.xml b/features/odl-controller-mdsal-common/pom.xml
index 698d4cd74e..1ccb9814a2 100644
--- a/features/odl-controller-mdsal-common/pom.xml
+++ b/features/odl-controller-mdsal-common/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,9 +17,7 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-controller-mdsal-common</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-
     <name>OpenDaylight :: MDSAL :: Common</name>
 
     <dependencies>
@@ -41,5 +38,4 @@
             <artifactId>sal-common-util</artifactId>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/features/odl-controller-model-topology/pom.xml b/features/odl-controller-model-topology/pom.xml
index 3286abb868..a8a0f2cb8a 100644
--- a/features/odl-controller-model-topology/pom.xml
+++ b/features/odl-controller-model-topology/pom.xml
@@ -7,7 +7,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -17,9 +16,7 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-controller-model-topology</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-
     <name>OpenDaylight :: MD-SAL :: Topology Model</name>
 
     <dependencies>
diff --git a/features/odl-jolokia/pom.xml b/features/odl-jolokia/pom.xml
index 7febd7a47e..27cb66475d 100644
--- a/features/odl-jolokia/pom.xml
+++ b/features/odl-jolokia/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -36,5 +35,4 @@
             <classifier>configuration</classifier>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/features/odl-mdsal-benchmark/pom.xml b/features/odl-mdsal-benchmark/pom.xml
index 70ed899c52..6244bfc7d0 100644
--- a/features/odl-mdsal-benchmark/pom.xml
+++ b/features/odl-mdsal-benchmark/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,7 +17,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-benchmark</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Controller :: Benchmarks</name>
     <description>Controller benchmarks</description>
diff --git a/features/odl-mdsal-broker-local/pom.xml b/features/odl-mdsal-broker-local/pom.xml
index 2183c894fa..c530323e0a 100644
--- a/features/odl-mdsal-broker-local/pom.xml
+++ b/features/odl-mdsal-broker-local/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,7 +17,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-broker-local</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: MDSAL :: Broker (local)</name>
@@ -69,5 +67,4 @@
             <artifactId>mdsal-dom-inmemory-datastore</artifactId>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/features/odl-mdsal-broker/pom.xml b/features/odl-mdsal-broker/pom.xml
index eeba557b48..220266cb88 100644
--- a/features/odl-mdsal-broker/pom.xml
+++ b/features/odl-mdsal-broker/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,7 +17,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-broker</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: MDSAL :: Broker (clustered)</name>
diff --git a/features/odl-mdsal-clustering-commons/pom.xml b/features/odl-mdsal-clustering-commons/pom.xml
index e023b884ab..06a7ee79ed 100644
--- a/features/odl-mdsal-clustering-commons/pom.xml
+++ b/features/odl-mdsal-clustering-commons/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,9 +17,7 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-clustering-commons</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-
     <name>OpenDaylight :: Controller :: Clustering Commons</name>
     <description>Common Clustering utilities</description>
 
@@ -109,5 +106,4 @@
             <version>5.2</version>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/features/odl-mdsal-distributed-datastore/pom.xml b/features/odl-mdsal-distributed-datastore/pom.xml
index 9ab26503d0..ebb1e48417 100644
--- a/features/odl-mdsal-distributed-datastore/pom.xml
+++ b/features/odl-mdsal-distributed-datastore/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,9 +17,7 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-distributed-datastore</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-
     <name>OpenDaylight :: Controller :: Clustered Datastore</name>
     <description>Controller Clustered Datastore (akka-based)</description>
 
diff --git a/features/odl-mdsal-model-inventory/pom.xml b/features/odl-mdsal-model-inventory/pom.xml
index b45e222a95..8dd7b2f6aa 100644
--- a/features/odl-mdsal-model-inventory/pom.xml
+++ b/features/odl-mdsal-model-inventory/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,9 +17,7 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-model-inventory</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-
     <name>OpenDaylight :: MD-SAL :: Inventory Model</name>
 
     <dependencies>
diff --git a/features/odl-mdsal-remoterpc-connector/pom.xml b/features/odl-mdsal-remoterpc-connector/pom.xml
index beac355f74..51ba584d38 100644
--- a/features/odl-mdsal-remoterpc-connector/pom.xml
+++ b/features/odl-mdsal-remoterpc-connector/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,9 +17,7 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-remoterpc-connector</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-
     <name>OpenDaylight :: Controller :: Remote RPC Connector</name>
     <description>Clustering remote RPC support</description>
 
diff --git a/features/odl-toaster/pom.xml b/features/odl-toaster/pom.xml
index cead20ed6c..7b15c6e5c9 100644
--- a/features/odl-toaster/pom.xml
+++ b/features/odl-toaster/pom.xml
@@ -8,7 +8,6 @@
  -->
 <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>single-feature-parent</artifactId>
@@ -18,9 +17,7 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-toaster</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-
     <name>OpenDaylight :: Toaster</name>
 
     <dependencies>
@@ -39,17 +36,14 @@
         <dependency>
             <groupId>org.opendaylight.controller.samples</groupId>
             <artifactId>sample-toaster</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.samples</groupId>
             <artifactId>sample-toaster-consumer</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.samples</groupId>
             <artifactId>sample-toaster-provider</artifactId>
-            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>