Bump odlparent to 6.0.0

This bumps odlparent to 6.0.0 as part of Magnesium MRI.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7455786e9145cabe3dde3f9d07bbd2b4834679d3..9700e75c01e54d72337b78b76d56732164ed9091 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/parent/pom.xml b/features/parent/pom.xml
index b107e7dda4cba12376a2db356f8c14eb0c7c5fa4..ea8353626324ad336acd7e3ff3224f564b633062 100644 (file)
--- a/features/parent/pom.xml
+++ b/features/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/production/pom.xml b/features/production/pom.xml
index 840b7830ec1234126095ed3ec7e729cc769fbeb8..c31458ae858a4475bf8c9ea9dc53fe3bc4beacf7 100644 (file)
--- a/features/production/pom.xml
+++ b/features/production/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/test/features-neutron-test/pom.xml b/features/test/features-neutron-test/pom.xml
index 6cd2e10dcc7e303714b645e90a00cf4adb450d3a..791c3442cafd4bfaf5f89fc8dc19a5fa79b874d0 100644 (file)
--- a/features/test/features-neutron-test/pom.xml
+++ b/features/test/features-neutron-test/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/test/pom.xml b/features/test/pom.xml
index 38968cf4fa1e9eebceb75ecb32acf17379fb5a6a..8e990b1ae6ab84fcac9cbe518a07d345ae927a71 100644 (file)
--- a/features/test/pom.xml
+++ b/features/test/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/integration/test-standalone/pom.xml b/integration/test-standalone/pom.xml
index a674dd4be2e3c40114a76ed11d404d70a7889717..d3ce83f5936bf74a94e1eb8f3fbb9344846ac4d9 100644 (file)
--- a/integration/test-standalone/pom.xml
+++ b/integration/test-standalone/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 
@@ -17,6 +17,10 @@
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: neutron :: ${project.artifactId}</name>
 
+  <properties>
+    <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+  </properties>
+
   <dependencies>
     <dependency>
       <!-- GSON is only used by the test code (which is in src/main here) -->

diff --git a/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/HttpUtils.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/HttpUtils.java
index 206e5b89ec10f9d120877558c7d5083dbfef8b68..e34c70d15b18a45f5123b3c4e1e11d61ead57b30 100644 (file)
--- a/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/HttpUtils.java
+++ b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/HttpUtils.java
@@ -27,7 +27,9 @@ public final class HttpUtils {
     // copy/pasted from org.opendaylight.neutron.northbound.api.AbstractNeutronNorthbound
     public static final int HTTP_MISSING_DEPENDENCY = 442; // see NEUTRON-158
 
-    private HttpUtils() { }
+    private HttpUtils() {
+
+    }
 
     static HttpURLConnection httpURLConnectionFactoryGet(URL url) throws IOException {
         HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();

diff --git a/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronAllTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronAllTests.java
index 8af3f6a06fbb96fc0c80d863ec880d7e0b60803e..451938d0b276391627f3dbd5a5f4c8909bdc882a 100644 (file)
--- a/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronAllTests.java
+++ b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronAllTests.java
@@ -11,7 +11,9 @@ import java.io.IOException;
 
 public final class NeutronAllTests {
 
-    private NeutronAllTests() { }
+    private NeutronAllTests() {
+
+    }
 
     public static void testNeutron(String baseURL) throws IOException, InterruptedException {
         NeutronNetworkTests.runTests(baseURL);

diff --git a/karaf/pom.xml b/karaf/pom.xml
index ba631f13f9a19f58a4c28119db62f37c1257134c..b8ed9f18e6b649d199e173da740b3609190010f8 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/neutron-hostconfig/pom.xml b/neutron-hostconfig/pom.xml
index c70f16fc66f71f355a46d66ccdac1d693f3643e0..40dcaba30c7f8945f9cd9b6f88cfd64006249a0d 100644 (file)
--- a/neutron-hostconfig/pom.xml
+++ b/neutron-hostconfig/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/neutron-spi/pom.xml b/neutron-spi/pom.xml
index 0d8ef33b91f30f6e5c0225f03ef6d40726b8b7fb..6e1e6f1f2bc5f0cccdf4df4e813c1a27d2ea5112 100644 (file)
--- a/neutron-spi/pom.xml
+++ b/neutron-spi/pom.xml
@@ -24,6 +24,11 @@
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: neutron :: ${project.artifactId}</name>
 
+  <properties>
+    <!-- FIXME: Workaround for https://issues.apache.org/jira/browse/ARIES-1923 -->
+    <maven.compiler.release>10</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>

diff --git a/northbound-api/pom.xml b/northbound-api/pom.xml
index a2ecf25feaf2c3ac298fc90ff327b06e313ebd1a..a551bc531d0857d3b1477795f27f97af40ec358d 100644 (file)
--- a/northbound-api/pom.xml
+++ b/northbound-api/pom.xml
@@ -24,6 +24,11 @@
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: neutron :: ${project.artifactId}</name>
 
+  <properties>
+    <!-- FIXME: Workaround for https://issues.apache.org/jira/browse/ARIES-1923 -->
+    <maven.compiler.release>10</maven.compiler.release>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>