From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 16 Jan 2020 11:23:47 +0000 (+0100)
Subject: Bump odlparent to 6.0.4
X-Git-Tag: v5.0.0~228
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=30fa9cf35b86299c1080f912a90a9fca791120b0

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 7390db9c7c..fc4d58fb80 100644
--- 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 cb34b66634..29cd8a492d 100644
--- 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 f5a5f8a42b..a9de183d3f 100644
--- 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 927f2f0692..d58e77af86 100644
--- 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 a966cc8700..85921f55e2 100644
--- 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 8ecc7280fc..6cdcbe8155 100644
--- 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 00e8f65009..c3f73a0a19 100644
--- 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 746ea1d76c..0e81df5719 100644
--- 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 4b4c2a6f60..54cc21d806 100644
--- 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 c0f15cfcc8..a6fef0d594 100644
--- 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 683cde9db8..41de67dce0 100644
--- 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 2c8acfc2ca..9d7df850df 100644
--- 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 e43b00b782..4df67ac493 100644
--- 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 03e03cb4f5..6d8653b826 100644
--- 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 34ce8a2d5a..e7819ad1cd 100644
--- 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 3146dd00cc..f5899f2831 100644
--- 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 6fe0868cdc..99f2030463 100644
--- 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 8d6c7e2a96..b01b6ee0b5 100644
--- 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 713f0c0007..9a47fe29c2 100644
--- 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 0d7b52a8f9..fd2d61e063 100644
--- 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 a072cdca6c..91e98768c5 100644
--- 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 221cd5be42..103e2ab43a 100644
--- 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 ced7bd86b0..8a5ef1f446 100644
--- 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 25934e03d3..ec9492f9d4 100644
--- 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 1b130cd7e5..2b664f1031 100644
--- 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 c621311528..64cbc92aa9 100644
--- 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 d8a3ccb647..de90a64c88 100644
--- 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 587168b7da..78739e3ae3 100644
--- 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 5e0bd3d15e..47125ad08b 100644
--- 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 cf0d0b7460..6dd03fc24d 100644
--- 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>