From d12f66ca0839135aed3fbe5a1b7c43979c1799b3 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 3 Mar 2020 21:36:59 +0100
Subject: [PATCH] Bump odlparent to 7.0.0-SNAPSHOT

This picks up upgraded odlparent, notably for pre-installed SCR.

Change-Id: Ia09fd208833dc022aaa23834569f334910f9e8fa
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                          | 2 +-
 benchmarks/pom.xml                                         | 2 +-
 bundle-parent/pom.xml                                      | 2 +-
 common/mockito-configuration/pom.xml                       | 2 +-
 common/pom.xml                                             | 2 +-
 common/testutils/pom.xml                                   | 2 +-
 distribution-karaf/pom.xml                                 | 2 +-
 features/features-yangtools-experimental/pom.xml           | 2 +-
 features/features-yangtools/pom.xml                        | 2 +-
 features/odl-yangtools-codec/pom.xml                       | 2 +-
 features/odl-yangtools-codec/src/main/feature/feature.xml  | 4 ++--
 features/odl-yangtools-common/pom.xml                      | 2 +-
 features/odl-yangtools-data-api/pom.xml                    | 2 +-
 features/odl-yangtools-data/pom.xml                        | 2 +-
 features/odl-yangtools-data/src/main/feature/feature.xml   | 3 +--
 features/odl-yangtools-exp-data-xpath-api/pom.xml          | 2 +-
 features/odl-yangtools-exp-data-xpath/pom.xml              | 2 +-
 features/odl-yangtools-export/pom.xml                      | 2 +-
 features/odl-yangtools-netty/pom.xml                       | 2 +-
 features/odl-yangtools-netty/src/main/feature/feature.xml  | 2 +-
 features/odl-yangtools-parser-api/pom.xml                  | 2 +-
 features/odl-yangtools-parser/pom.xml                      | 2 +-
 features/odl-yangtools-parser/src/main/feature/feature.xml | 3 +--
 features/odl-yangtools-util/pom.xml                        | 2 +-
 features/odl-yangtools-util/src/main/feature/feature.xml   | 2 +-
 features/odl-yangtools-xpath-api/pom.xml                   | 2 +-
 features/odl-yangtools-xpath/pom.xml                       | 2 +-
 features/odl-yangtools-xpath/src/main/feature/feature.xml  | 6 ------
 features/pom.xml                                           | 2 +-
 pom.xml                                                    | 2 +-
 yang-validation-tool/pom.xml                               | 2 +-
 yang/pom.xml                                               | 2 +-
 yang/yang-maven-plugin-it/pom.xml                          | 2 +-
 yang/yang-maven-plugin-spi/pom.xml                         | 2 +-
 yang/yang-maven-plugin/pom.xml                             | 2 +-
 yang/yang-model-validator/pom.xml                          | 2 +-
 36 files changed, 36 insertions(+), 44 deletions(-)
 delete mode 100644 features/odl-yangtools-xpath/src/main/feature/feature.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index d05141ed19..40455b02bb 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.5</version>
+      <version>7.0.0-SNAPSHOT</version>
       <relativePath/>
     </parent>
 
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index fbbe0efcdc..f2bcf91994 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index ac88abddb5..b2b1216550 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml
index 1295cc6a7d..52da17aeca 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/common/pom.xml b/common/pom.xml
index 0dda33d29e..3ae6c88697 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.5</version>
+      <version>7.0.0-SNAPSHOT</version>
       <relativePath/>
     </parent>
 
diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml
index 08a342a7bd..19bfcce5ff 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index bd30dc9b6c..650c6104ec 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml
index f8b700ba0b..f3f8b8989e 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml
index 9fcd5bc4c7..88ec5bf7e2 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml
index 98e80b6ef7..2f0de784c9 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-codec/src/main/feature/feature.xml b/features/odl-yangtools-codec/src/main/feature/feature.xml
index c4bf354159..819f091dd5 100644
--- a/features/odl-yangtools-codec/src/main/feature/feature.xml
+++ b/features/odl-yangtools-codec/src/main/feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-codec">
     <feature name="odl-yangtools-codec">
-        <feature version="[6,7)">odl-gson</feature>
-        <feature version="[6,7)">odl-stax2-api</feature>
+        <feature version="[7,8)">odl-gson</feature>
+        <feature version="[7,8)">odl-stax2-api</feature>
     </feature>
 </features>
diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml
index 6b9b156006..ed4a5bf6b8 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml
index 8be77fa119..5de8cd1716 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml
index 0c8dfd620c..073e7555e9 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-data/src/main/feature/feature.xml b/features/odl-yangtools-data/src/main/feature/feature.xml
index e223a3755a..8f08da2102 100644
--- a/features/odl-yangtools-data/src/main/feature/feature.xml
+++ b/features/odl-yangtools-data/src/main/feature/feature.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-data">
     <feature name="odl-yangtools-data">
-        <feature version="[6,7)">odl-antlr4</feature>
-        <feature>scr</feature>
+        <feature version="[7,8)">odl-antlr4</feature>
     </feature>
 </features>
diff --git a/features/odl-yangtools-exp-data-xpath-api/pom.xml b/features/odl-yangtools-exp-data-xpath-api/pom.xml
index 0f362e14de..fb96bbd4fb 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-exp-data-xpath/pom.xml b/features/odl-yangtools-exp-data-xpath/pom.xml
index 8441ec3266..791c81a24f 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml
index 425bbccb76..ac010269e0 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-netty/pom.xml b/features/odl-yangtools-netty/pom.xml
index d5e5c556b2..a14f60667c 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-netty/src/main/feature/feature.xml b/features/odl-yangtools-netty/src/main/feature/feature.xml
index 6c3d767b28..a90e839fdf 100644
--- a/features/odl-yangtools-netty/src/main/feature/feature.xml
+++ b/features/odl-yangtools-netty/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-netty">
     <feature name="odl-yangtools-netty">
-        <feature version="[6,7)">odl-netty-4</feature>
+        <feature version="[7,8)">odl-netty-4</feature>
     </feature>
 </features>
diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml
index 85ac61832a..5bdc107ef4 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml
index 16cb8c2744..fcc75d86b2 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-parser/src/main/feature/feature.xml b/features/odl-yangtools-parser/src/main/feature/feature.xml
index 8f4b841215..967294960d 100644
--- a/features/odl-yangtools-parser/src/main/feature/feature.xml
+++ b/features/odl-yangtools-parser/src/main/feature/feature.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-parser">
     <feature name="odl-yangtools-parser">
-        <feature version="[6,7)">odl-antlr4</feature>
-        <feature>scr</feature>
+        <feature version="[7,8)">odl-antlr4</feature>
     </feature>
 </features>
diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml
index ccee198a0b..7580185e21 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-util/src/main/feature/feature.xml b/features/odl-yangtools-util/src/main/feature/feature.xml
index 5b385406e5..1866a6fcc1 100644
--- a/features/odl-yangtools-util/src/main/feature/feature.xml
+++ b/features/odl-yangtools-util/src/main/feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-util">
     <feature name="odl-yangtools-util">
-        <feature version="[6,7)">odl-guava</feature>
+        <feature version="[7,8)">odl-guava</feature>
         <feature version="[1,2)">pt-triemap</feature>
     </feature>
 </features>
diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml
index 7b73e5d7e2..63f7fa36ce 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml
index d00250a8e0..bb286e24e2 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-xpath/src/main/feature/feature.xml b/features/odl-yangtools-xpath/src/main/feature/feature.xml
deleted file mode 100644
index 291ab204d2..0000000000
--- a/features/odl-yangtools-xpath/src/main/feature/feature.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-xpath">
-    <feature name="odl-yangtools-xpath">
-        <feature>scr</feature>
-    </feature>
-</features>
diff --git a/features/pom.xml b/features/pom.xml
index 410934d316..fe6ad189a3 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 860cdde629..61e265a38d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>6.0.5</version>
+      <version>7.0.0-SNAPSHOT</version>
       <relativePath/>
     </parent>
 
diff --git a/yang-validation-tool/pom.xml b/yang-validation-tool/pom.xml
index 68e62b84bd..fd3f6c59b2 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/pom.xml b/yang/pom.xml
index 225a87cddb..1d14f8bf50 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml
index ede70a54a2..8a7c0d00e9 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml
index be258584a2..bb12640d51 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml
index b4e8bce4c8..8f4da64354 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/yang-model-validator/pom.xml b/yang/yang-model-validator/pom.xml
index 26586f5c78..9eb68e23d3 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.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
-- 
2.36.6