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 6875de8c48b96bf571a048f8b7250c4e08795899..db0d9fda899e7b2ae72c7efc51dcafd73954cccb 100644 (file)
--- 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 5405fc3ef8d12659a43b2c3ccf95f3fba6bdf131..41aa657373e4506d4835ac7df23b515be56482a5 100644 (file)
--- 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 118e9318892b7a7b150f9e81913aeeaf7abc3818..4cc47ae5b72ddb9d481c7d66ccc3f0f6bf0a4893 100644 (file)
--- 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 b29b110fa2d4b3568dbe214c62cfc40c57fcef05..ec7884d78faedc9aab1d804ab8681148c63f161e 100644 (file)
--- 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 0a8e67d2205a3aaddcf5c23aebf67cd6fe4830a6..1d3299ef6a6252daafaf12532ce821b4cfce3cfa 100644 (file)
--- 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 e3ad8ee99d5dfec26a5fef2dba0d12ab79bad1e9..a8dc875fc04e5a241280db130886920e0205b47d 100644 (file)
--- 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 698d4cd74e6dfacf5973f9c312122f4846f94df9..1ccb9814a2dc8a68b4d511472426b07bc9d8e5e9 100644 (file)
--- 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 3286abb86863b1376ba96098efd7bd72f7fab1cf..a8a0f2cb8a19f311f37876a74305a9647b4deb5a 100644 (file)
--- 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 7febd7a47eaefa477f1e5753dd19927519dd512b..27cb66475d370c86da0423593cc410d28d99cd0a 100644 (file)
--- 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 70ed899c5248336a5f4cdbc37ac23f4842a57d94..6244bfc7d06a481553d2f2b8e273bbdc5293586a 100644 (file)
--- 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 2183c894fa5ddb203dd1c108752f0d54806b2827..c530323e0afeea755d3842de4ff84fe10ef08d8c 100644 (file)
--- 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 eeba557b482b662c799e4a76f4d5c2b3f02270dd..220266cb8894db27ad7bc1c329022aad85ee41a2 100644 (file)
--- 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 e023b884ab2c159a74d4e5c6ead60995d0319f82..06a7ee79edbb8f09d22371c5857960eaf6404d22 100644 (file)
--- 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 9ab26503d02bfc450b7ee767631af284812d0e14..ebb1e4841701c00553df9de0e2e965cb2849c6f6 100644 (file)
--- 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 b45e222a95c64ab5b81f8605319226149bcf9c35..8dd7b2f6aa0b6f8fe7b1561cf11b15955b4f87d0 100644 (file)
--- 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 beac355f744bcc4610642fb8be055d3b57b58466..51ba584d38049f907a145efb80fba4d2ad53ada1 100644 (file)
--- 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 cead20ed6cd2c2a96b2a7c9fbe1fbb60e34b855b..7b15c6e5c96516a2aea84b533e577e23a4250001 100644 (file)
--- 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>