Update property information for version 4

This drops a number of obsolete properties.

Change-Id: Ic0657f603cb27ccf7ca0c1a8728a74ece677cf0b
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 72f753c3580000d2d857cceaeef0b883f06b66aa..f4681a862f1a14f98173ff61acc55acf2d722ca4 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -275,7 +275,7 @@
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
-                <version>${karaf.plugin.version}</version>
+                <version>${karaf.version}</version>
                 <executions>
                     <execution>
                         <id>process-resources</id>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 79bf89aaafc8686665f3e0a57b68ecd214d1c98a..1fd793082360ae96febf563b0cb69ecfeea8148a 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -194,7 +194,7 @@ mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.
              as the karaf4-parent will do this again                -->
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
-        <version>${karaf.plugin.version}</version>
+        <version>${karaf.version}</version>
         <executions>
           <execution>
             <id>process-resources</id>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 2f8f1b9c89be9bdee4faeae83a56a000669e26b8..dc22ce54c538a9196244a1af458de4a94a5bec28 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -47,45 +47,21 @@
     <java.version.source>${maven.compiler.source}</java.version.source>
     <java.version.target>${maven.compiler.target}</java.version.target>
 
-    <!-- Maven plugin versions, in the 'canonical' format -->
-    <!-- Used in didm, l2switch, lacp, persistence; see also controller -->
-    <maven.compile.plugin.version>3.7.0</maven.compile.plugin.version>
-    <!-- Used in snmp -->
-    <maven.plugin.version>3.5</maven.plugin.version>
-    <!-- Used in controller, iotdm, neutron, of-config -->
-    <!-- Later versions break tests in downstream projects -->
-    <maven.surefire.version>2.18.1</maven.surefire.version>
-
-    <!-- Used in packetcable -->
-    <odl.checkstyle.version>3.0.0-SNAPSHOT</odl.checkstyle.version>
-    <!-- Used in l2switch, lacp, netide, ocpplugin, openflowjava, openflowplugin, snbi, tsdr -->
+    <!-- Used in openflowplugin -->
     <enforcer.version>3.0.0-M1</enforcer.version>
-    <!-- Used in snmp4sdn; see also nemo -->
-    <enunciate.version>1.31</enunciate.version>
-    <!-- Used in controller, infrautils, netide, openflowplugin -->
+    <!-- Used in controller, infrautils, openflowplugin -->
     <exam.version>4.12.0</exam.version>
-    <!-- Used in of-config, snmp4sdn -->
-    <failsafe.version>2.20.1</failsafe.version>
-    <!-- Used in genius, neutron, of-config, ovsdb, persistence, snmp4sdn, usc, vtn -->
+    <!-- Used in neutron, ovsdb -->
     <jacoco.version>0.8.1</jacoco.version>
-    <!-- Used in aaa, alto, bgpcep, bier, controller, coretutorials, genius, infrautils, iotdm,
-         l2switch, lacp, netconf, netide, netvirt, nic, ocpplugin, ovsdb, persistence, snbi, sxp,
-         tsdr, unimgr, vtn -->
+    <!-- Used in controller, genius, infrautils, netconf, netvirt, ovsdb, serviceutils -->
     <karaf.version>4.2.0</karaf.version>
-    <!-- Used in sxp -->
-    <karaf.plugin.version>4.2.0</karaf.plugin.version>
-    <!-- Used in lispflowmapping, snmp4sdn, vtn -->
+    <!-- Used in bgpcep, lispflowmapping -->
     <projectinfo>2.8.1</projectinfo>
-    <!-- Used in of-config; see also snmp4sdn -->
-    <propertymavenplugin.version>1.0.0</propertymavenplugin.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
     <bouncycastle.version>1.60</bouncycastle.version>
 
-    <!-- Used by snbi; see also bier, dlux, iotdm, tsdr, unimgr -->
-    <osgi.core.version>5.0.0</osgi.core.version>
-
     <!-- Default Sonar configuration -->
     <sonar-jacoco-listeners.version>3.8</sonar-jacoco-listeners.version>
     <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@ -583,7 +559,8 @@
       <dependency>
         <groupId>org.codehaus.enunciate</groupId>
         <artifactId>enunciate-core-annotations</artifactId>
-        <version>${enunciate.version}</version>
+        <!-- This must be aligned with the version of maven-enunciate-plugin specified below -->
+        <version>1.31</version>
         <exclusions>
           <exclusion>
             <!-- JSR 250 API has 6 very old versions of javax.annotation @PreDestroy & Co.
@@ -658,13 +635,13 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.compendium</artifactId>
-        <version>${osgi.core.version}</version>
+        <version>5.0.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
-        <version>${osgi.core.version}</version>
+        <version>5.0.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -1219,7 +1196,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven.compile.plugin.version}</version>
+          <version>3.7.0</version>
           <configuration>
             <source>1.8</source>
             <target>1.8</target>
@@ -1236,7 +1213,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>${failsafe.version}</version>
+          <version>2.20.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-invoker-plugin</artifactId>
@@ -1270,7 +1247,7 @@
 
         <plugin>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>${maven.plugin.version}</version>
+          <version>3.5</version>
         </plugin>
 
         <plugin>
@@ -1300,7 +1277,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${maven.surefire.version}</version>
+          <version>2.18.1</version>
           <configuration>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
             <trimStackTrace>false</trimStackTrace>
@@ -1366,7 +1343,8 @@
         <plugin>
           <groupId>org.codehaus.enunciate</groupId>
           <artifactId>maven-enunciate-plugin</artifactId>
-          <version>${enunciate.version}</version>
+          <!-- This must be aligned with the version of enunciate-core-annotations specified above -->
+          <version>1.31</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.groovy.maven</groupId>
@@ -1487,7 +1465,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>properties-maven-plugin</artifactId>
-          <version>${propertymavenplugin.version}</version>
+          <version>1.0.0</version>
         </plugin>
         <plugin>
           <groupId>org.eclipse.xtend</groupId>

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index f6400cfb8ca00b7c1b52012c9e184bdd34bf117b..a3704dbc0aa60b4a9ac1b4ee7d935bce55fa29d1 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -91,7 +91,6 @@
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.version}</version>
                 <configuration>
                     <dependenciesToScan>
                         <dependency>org.opendaylight.odlparent:features-test</dependency>

diff --git a/untested-single-feature-parent/pom.xml b/untested-single-feature-parent/pom.xml
index ea201d1616c41f51e6bc9002a4e4685f4295e39e..0790220ec0dcf23e5c181950a63d93edcf9e4083 100644 (file)
--- a/untested-single-feature-parent/pom.xml
+++ b/untested-single-feature-parent/pom.xml
@@ -46,7 +46,7 @@
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
-                <version>${karaf.plugin.version}</version>
+                <version>${karaf.version}</version>
                 <extensions>true</extensions>
                 <configuration combine.children="append">
                     <enableGeneration>true</enableGeneration>