Bump odlparent to 6.0.4

This adopts odlparent-6.0.4, along with the fix to SFT.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7390db9c7cc8fd0cc0595cd7928eed0da8184614..fc4d58fb8054cb977b8691f9486c05fda1e34d77 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>6.0.3</version>
+      <version>6.0.4</version>
       <relativePath/>
     </parent>
 

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index cb34b6663465e70152754d801cb956bade6dea38..29cd8a492dbd3725db6eb5a0b9f3794649df54d6 100644 (file)
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index f5a5f8a42b5628fea58815155a10d6093e8841ad..a9de183d3f1f521c03f6b7bb13fd95b8968d2742 100644 (file)
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml
index 927f2f0692b79ac76b51cad8300dffa1701e18fc..d58e77af8614541b592b4b70c2d90536b5631f01 100644 (file)
--- a/common/mockito-configuration/pom.xml
+++ b/common/mockito-configuration/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index a966cc87004b4ed38b8e4c1b176bb27e73d35a0b..85921f55e2b8113bd4220ba4642c3771b5c91b88 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>6.0.3</version>
+      <version>6.0.4</version>
       <relativePath/>
     </parent>
 

diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml
index 8ecc7280fcc24be7593c73d0f15da9cfe2d15254..6cdcbe815524db91ecb46dba381645b6fb789a0a 100644 (file)
--- a/common/testutils/pom.xml
+++ b/common/testutils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 00e8f65009db076e691fa2b577499ce10355bdaa..c3f73a0a19d0b5f899916f65b7f5843f53b83e4f 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml
index 746ea1d76c50cec03b909d208cd02e96584f2691..0e81df5719a9ae7428577ce00abe943eb5f6bb07 100644 (file)
--- a/features/features-yangtools-experimental/pom.xml
+++ b/features/features-yangtools-experimental/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml
index 4b4c2a6f60d67dc54169af0aa9b2f54b341b12a5..54cc21d80621a2c3fec6ac82f1c21d790e0ce247 100644 (file)
--- a/features/features-yangtools/pom.xml
+++ b/features/features-yangtools/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml
index c0f15cfcc8808bf039e26fb7f7085d7bd9cd30e2..a6fef0d594209241eddc00526772b85a158e6e91 100644 (file)
--- a/features/odl-yangtools-codec/pom.xml
+++ b/features/odl-yangtools-codec/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml
index 683cde9db82cf6de4a3edfba5559c790cc0dcb32..41de67dce022381db04898609b3a9ed4ba95e3bf 100644 (file)
--- a/features/odl-yangtools-common/pom.xml
+++ b/features/odl-yangtools-common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml
index 2c8acfc2cafd97d5cb4d68927d6145eb9a35fc92..9d7df850dfecd8bd5cf3ef196789d478b9e64198 100644 (file)
--- a/features/odl-yangtools-data-api/pom.xml
+++ b/features/odl-yangtools-data-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml
index e43b00b782d7b57ba6864da8889a6f4b2f537f1d..4df67ac493d2b2ffd208c809b4c6671304e13d7c 100644 (file)
--- a/features/odl-yangtools-data/pom.xml
+++ b/features/odl-yangtools-data/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-exp-data-xpath-api/pom.xml b/features/odl-yangtools-exp-data-xpath-api/pom.xml
index 03e03cb4f59a28810ee37dfcd199cf3b68b8b2c0..6d8653b826eef6aa3fd86006486c8a9e631ec1b1 100644 (file)
--- a/features/odl-yangtools-exp-data-xpath-api/pom.xml
+++ b/features/odl-yangtools-exp-data-xpath-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-exp-data-xpath/pom.xml b/features/odl-yangtools-exp-data-xpath/pom.xml
index 34ce8a2d5ad322d2ad62aedb42ad1468d23daf8e..e7819ad1cd0c37c0db4021976c12dd834d5b37df 100644 (file)
--- a/features/odl-yangtools-exp-data-xpath/pom.xml
+++ b/features/odl-yangtools-exp-data-xpath/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml
index 3146dd00cc6e8e5e890d18ffb8b963483caf14e7..f5899f2831418bbb3cb67522348d4a6131d940eb 100644 (file)
--- a/features/odl-yangtools-export/pom.xml
+++ b/features/odl-yangtools-export/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-netty/pom.xml b/features/odl-yangtools-netty/pom.xml
index 6fe0868cdc733d0ebd25fe7d265085fdaff694fe..99f20304638808d3b65caf458a9667af52d90f45 100644 (file)
--- a/features/odl-yangtools-netty/pom.xml
+++ b/features/odl-yangtools-netty/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml
index 8d6c7e2a96db6b33f24ef4fedfb345f27611c63e..b01b6ee0b5e2402d47d6fed9e2621b60918bd1d7 100644 (file)
--- a/features/odl-yangtools-parser-api/pom.xml
+++ b/features/odl-yangtools-parser-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml
index 713f0c00075209a299e1a1caa3b6565c13a226b0..9a47fe29c294bef1ccf6999c3a9080163ce67987 100644 (file)
--- a/features/odl-yangtools-parser/pom.xml
+++ b/features/odl-yangtools-parser/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml
index 0d7b52a8f91c480a43adedf4a7f9e69587286bbf..fd2d61e0634bf065537c3538dda584542d00aebd 100644 (file)
--- a/features/odl-yangtools-util/pom.xml
+++ b/features/odl-yangtools-util/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml
index a072cdca6c99fb868768db9169577d4995a64bcd..91e98768c5f02b6f3470dd6fce723fc5f858db34 100644 (file)
--- a/features/odl-yangtools-xpath-api/pom.xml
+++ b/features/odl-yangtools-xpath-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml
index 221cd5be4273dca3fa6745fa97da049fc95db372..103e2ab43aff3d3e3b08a9974701f08455d8db70 100644 (file)
--- a/features/odl-yangtools-xpath/pom.xml
+++ b/features/odl-yangtools-xpath/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index ced7bd86b08465f6c7852156232aee437c64d7fd..8a5ef1f44603b628c918ae05e2d84c80f17735d5 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 25934e03d3a7f54583dfcb74c3882fa393067867..ec9492f9d4455fb898e0b6ce08c751226e9f0c37 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>6.0.3</version>
+      <version>6.0.4</version>
       <relativePath/>
     </parent>
 

diff --git a/yang-validation-tool/pom.xml b/yang-validation-tool/pom.xml
index 1b130cd7e5b520e30d897a2a370413ed8d580f10..2b664f1031b6e7351aa42b96c3ce6fd2168ec1cc 100644 (file)
--- a/yang-validation-tool/pom.xml
+++ b/yang-validation-tool/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/yang/pom.xml b/yang/pom.xml
index c621311528d6f4640d6ab6524c8fc205254a4434..64cbc92aa9f38ccaca7248f40b0bd2e1abc98aef 100644 (file)
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/yang/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml
index d8a3ccb6470e6891a94e335905fad0834c6046eb..de90a64c883bd397c358d46017b537c3be0b750e 100644 (file)
--- a/yang/yang-maven-plugin-it/pom.xml
+++ b/yang/yang-maven-plugin-it/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml
index 587168b7da50dc3383e967ae406e821bc993205b..78739e3ae33a974af56ae101a679c1e0143608f2 100644 (file)
--- a/yang/yang-maven-plugin-spi/pom.xml
+++ b/yang/yang-maven-plugin-spi/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml
index 5e0bd3d15e5231ee2a20817c016838de38359b2c..47125ad08b145f622c16f2a24a6eaddcfa66ac98 100644 (file)
--- a/yang/yang-maven-plugin/pom.xml
+++ b/yang/yang-maven-plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/yang/yang-model-validator/pom.xml b/yang/yang-model-validator/pom.xml
index cf0d0b7460c003eb309129437ef4585dccb057ba..6dd03fc24d4b78c01c3d8e60bf5b326dce669c88 100644 (file)
--- a/yang/yang-model-validator/pom.xml
+++ b/yang/yang-model-validator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
@@ -94,7 +94,7 @@
                 <executions>
                     <execution>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                         <phase>package</phase>
                         <configuration>