Eliminate {infra,service}utils.version

Rather than going through properties, use foo-artifacts to get
proper version declarations into dependencyManagement. This cleans
up version management a bit.

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

diff --git a/applications/arbitratorreconciliation/impl/pom.xml b/applications/arbitratorreconciliation/impl/pom.xml
index bd96f27934cc43a8dbd2886d80f3a530150f5dad..ba4e2df4535898036f939eca233b11e18732f6ea 100644 (file)
--- a/applications/arbitratorreconciliation/impl/pom.xml
+++ b/applications/arbitratorreconciliation/impl/pom.xml
@@ -20,7 +20,6 @@
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>upgrade</artifactId>
-            <version>${serviceutils.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>

diff --git a/applications/bulk-o-matic/pom.xml b/applications/bulk-o-matic/pom.xml
index 6a8db7442944a18e555f96fe451147d86589d6b6..581aa3cd37e19cac2d51c8b4e4663e87f6a523e0 100644 (file)
--- a/applications/bulk-o-matic/pom.xml
+++ b/applications/bulk-o-matic/pom.xml
@@ -32,7 +32,6 @@
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-util</artifactId>
-      <version>${infrautils.version}</version>
     </dependency>
   </dependencies>
 

diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml
index c3f933127faf9a0af6622ad422cd55ba124a2586..c071ed3d8eb3c7ecbf9ee0f8cb9f8a749169dc17 100644 (file)
--- a/applications/forwardingrules-manager/pom.xml
+++ b/applications/forwardingrules-manager/pom.xml
@@ -36,7 +36,6 @@
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
       <artifactId>srm-api</artifactId>
-      <version>${serviceutils.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.model</groupId>
@@ -65,7 +64,6 @@
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-util</artifactId>
-      <version>${infrautils.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>

diff --git a/applications/lldp-speaker/pom.xml b/applications/lldp-speaker/pom.xml
index 24aa3015b4c515140e3f3aa05f4887d390b233fb..1aa9da25ec569bb2d8847bc6dc913f88952161c9 100644 (file)
--- a/applications/lldp-speaker/pom.xml
+++ b/applications/lldp-speaker/pom.xml
@@ -61,7 +61,6 @@
         <dependency>
           <groupId>org.opendaylight.infrautils</groupId>
           <artifactId>infrautils-util</artifactId>
-          <version>${infrautils.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml
index c62925ffff3c7b20a53d83e2ccee28662ae647db..9e736e8e951d000f2fd3d61719f59ccaef83e8ed 100644 (file)
--- a/applications/of-switch-config-pusher/pom.xml
+++ b/applications/of-switch-config-pusher/pom.xml
@@ -41,7 +41,6 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>infrautils-util</artifactId>
-            <version>${infrautils.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>

diff --git a/applications/table-miss-enforcer/pom.xml b/applications/table-miss-enforcer/pom.xml
index fc4af23d466f7569beef3e0c420c9693f54e9a1d..032af3e428e6d68eb4df8d867c319f7c631e5f5b 100644 (file)
--- a/applications/table-miss-enforcer/pom.xml
+++ b/applications/table-miss-enforcer/pom.xml
@@ -42,7 +42,6 @@
       <dependency>
           <groupId>org.opendaylight.infrautils</groupId>
           <artifactId>infrautils-util</artifactId>
-          <version>${infrautils.version}</version>
       </dependency>
       <dependency>
           <groupId>org.opendaylight.openflowplugin.applications</groupId>

diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml
index cea1a012ab37e97e40dcfba2851bc242c6deed37..37ce747b1315d9753cd34a002c5f72399004feb9 100644 (file)
--- a/extension/test-extension/pom.xml
+++ b/extension/test-extension/pom.xml
@@ -58,7 +58,6 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>infrautils-util</artifactId>
-            <version>${infrautils.version}</version>
         </dependency>
 
         <!-- OpenFlowJava-API models -->

diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml
index 5e1cb5f7171d921b29c3b106ec2f8f4cb68ce81f..68d1d95c34e4db04a98aa01b6f688d8eb969ffcd 100644 (file)
--- a/features-aggregator/odl-openflowplugin-southbound/pom.xml
+++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml
@@ -15,13 +15,6 @@
 
     <name>OpenDaylight :: Openflow Plugin :: Li southbound API implementation</name>
 
-    <properties>
-        <mdsal.version>1.11.0-SNAPSHOT</mdsal.version>
-        <lldp.version>0.18.0-SNAPSHOT</lldp.version>
-        <infrautils.version>1.7.0-SNAPSHOT</infrautils.version>
-        <serviceutils.version>0.5.0-SNAPSHOT</serviceutils.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <!-- This project -->
@@ -36,7 +29,21 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>${mdsal.version}</version>
+                <version>1.11.0-SNAPSHOT</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.infrautils</groupId>
+                <artifactId>infrautils-artifacts</artifactId>
+                <version>1.7.0-SNAPSHOT</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.serviceutils</groupId>
+                <artifactId>serviceutils-artifacts</artifactId>
+                <version>0.5.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -48,21 +55,18 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>${mdsal.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>odl-infrautils-diagstatus</artifactId>
-            <version>${infrautils.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>odl-serviceutils-tools</artifactId>
-            <version>${serviceutils.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -118,7 +122,6 @@
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>odl-serviceutils-srm</artifactId>
-            <version>${serviceutils.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/openflowjava/openflow-protocol-api/pom.xml b/openflowjava/openflow-protocol-api/pom.xml
index fc6f26653d3829b1e3c40324581fc97bb563fc37..d5b8453307a7044256e93170655d974589a71a69 100644 (file)
--- a/openflowjava/openflow-protocol-api/pom.xml
+++ b/openflowjava/openflow-protocol-api/pom.xml
@@ -48,8 +48,6 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>diagstatus-api</artifactId>
-            <version>${infrautils.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>

diff --git a/openflowjava/openflow-protocol-impl/pom.xml b/openflowjava/openflow-protocol-impl/pom.xml
index 8cf2d0a0887420a9fc777dff27c87199e9a5123c..fdb7251c6b181cacc7678a3c73a481b945c61093 100644 (file)
--- a/openflowjava/openflow-protocol-impl/pom.xml
+++ b/openflowjava/openflow-protocol-impl/pom.xml
@@ -102,7 +102,6 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>infrautils-util</artifactId>
-            <version>${infrautils.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -111,7 +110,6 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>diagstatus-api</artifactId>
-            <version>${infrautils.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>

diff --git a/openflowplugin-api/pom.xml b/openflowplugin-api/pom.xml
index 06a8494c916530831745b3dd5a0b0ac1033f2501..75e063e08db3a2c507b2a5732159030092387166 100644 (file)
--- a/openflowplugin-api/pom.xml
+++ b/openflowplugin-api/pom.xml
@@ -49,7 +49,6 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>diagstatus-api</artifactId>
-            <version>${infrautils.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 11b5e175f74b5159a778bc8bc97a28a940451570..9e589896b9610abbeb0d30403129d843be256b11 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -59,7 +59,6 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>diagstatus-api</artifactId>
-            <version>${infrautils.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>

diff --git a/parent/pom.xml b/parent/pom.xml
index 6b51a64282e1baefda92c4a34a3ce738e83b4869..3b9ed5fac445c3024d1b7a73a5522e1a25c3a2aa 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,11 +29,6 @@
         <tag>HEAD</tag>
     </scm>
 
-    <properties>
-        <infrautils.version>1.7.0-SNAPSHOT</infrautils.version>
-        <serviceutils.version>0.5.0-SNAPSHOT</serviceutils.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -50,6 +45,20 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.infrautils</groupId>
+                <artifactId>infrautils-artifacts</artifactId>
+                <version>1.7.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.serviceutils</groupId>
+                <artifactId>serviceutils-artifacts</artifactId>
+                <version>0.5.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!-- thirdparty -->
             <dependency>
                 <groupId>net.sourceforge.argparse4j</groupId>

diff --git a/samples/learning-switch/pom.xml b/samples/learning-switch/pom.xml
index 747ae7e07ba6c2dbd7f6d4b9f65e5cfc4f84c4a0..d0ce4288ffdabbbd64ddeb8d2895a6a23e97ca5d 100644 (file)
--- a/samples/learning-switch/pom.xml
+++ b/samples/learning-switch/pom.xml
@@ -59,7 +59,6 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>infrautils-util</artifactId>
-            <version>${infrautils.version}</version>
         </dependency>
     </dependencies>
 </project>