From 428601fcf60f98b135ab874f984b942b5fe0ca5b Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 27 Dec 2018 16:56:56 +0100
Subject: [PATCH] Bump odlparent to 4.0.7

This fixes Java11 SFT compatiblity and removes the need to
declare triemap import.

Change-Id: Ia7c3f448cfceedd4cc6acd65b469438b328386c2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                | 2 +-
 benchmarks/pom.xml                               | 2 +-
 bundle-parent/pom.xml                            | 9 +--------
 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-triemap/pom.xml                     | 9 +--------
 features/odl-yangtools-codec/pom.xml             | 2 +-
 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-exp-xpath-api/pom.xml     | 2 +-
 features/odl-yangtools-exp-xpath-impl/pom.xml    | 2 +-
 features/odl-yangtools-export/pom.xml            | 2 +-
 features/odl-yangtools-parser-api/pom.xml        | 2 +-
 features/odl-yangtools-parser/pom.xml            | 2 +-
 features/odl-yangtools-util/pom.xml              | 2 +-
 features/odl-yangtools-xpath/pom.xml             | 2 +-
 features/pom.xml                                 | 2 +-
 pom.xml                                          | 2 +-
 third-party/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 +-
 30 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index da163950c2..58ee35a4ed 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>4.0.5</version>
+      <version>4.0.7</version>
       <relativePath/>
     </parent>
 
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index e454dc0846..6adbb902f7 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index 43592746ef..d2bb74782b 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
@@ -25,13 +25,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>tech.pantheon.triemap</groupId>
-                <artifactId>bom</artifactId>
-                <version>1.0.4</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml
index 8750b82685..b709362f5e 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/common/pom.xml b/common/pom.xml
index 8772945a87..7288a73b19 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>4.0.5</version>
+      <version>4.0.7</version>
       <relativePath/>
     </parent>
 
diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml
index d09ae181c2..00038bf2ad 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index d186696d18..de719b1f8b 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml
index eb58c79c15..98efff1981 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml
index f03b48d88d..745c51d61d 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-triemap/pom.xml b/features/odl-triemap/pom.xml
index 5e829b3712..8e05b00b96 100644
--- a/features/odl-triemap/pom.xml
+++ b/features/odl-triemap/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
@@ -25,13 +25,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>tech.pantheon.triemap</groupId>
-                <artifactId>bom</artifactId>
-                <version>1.0.4</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml
index caade553ab..2805a12c5a 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml
index 7d17098269..aeadb9e994 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml
index 7dad060071..9be9733680 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml
index 34d3306d26..8c64824e6d 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-exp-xpath-api/pom.xml b/features/odl-yangtools-exp-xpath-api/pom.xml
index 6e00908c93..c56b17c25d 100644
--- a/features/odl-yangtools-exp-xpath-api/pom.xml
+++ b/features/odl-yangtools-exp-xpath-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-exp-xpath-impl/pom.xml b/features/odl-yangtools-exp-xpath-impl/pom.xml
index 09c87eee1a..47129d11da 100644
--- a/features/odl-yangtools-exp-xpath-impl/pom.xml
+++ b/features/odl-yangtools-exp-xpath-impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml
index e24d11dfc8..8f8d681079 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml
index 19776fe611..59e2f0472e 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml
index 169ff9420e..bdc31022a8 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml
index c428ddc709..7bfe9d24b4 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml
index 1a85bcaf49..2736c554a0 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index dd203c8fce..a1e267f505 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 6de6a158fc..f02ffacf4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>4.0.5</version>
+      <version>4.0.7</version>
       <relativePath/>
     </parent>
 
diff --git a/third-party/pom.xml b/third-party/pom.xml
index dd559bc74b..528123a86d 100644
--- a/third-party/pom.xml
+++ b/third-party/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/yang-validation-tool/pom.xml b/yang-validation-tool/pom.xml
index ee1ca97ba3..01aa8ccd6f 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/pom.xml b/yang/pom.xml
index 8e92b93c5a..03dedb6921 100644
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml
index a20721b6b8..1e3a253bd7 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml
index 4e830d215a..43ef2c77d9 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml
index 619f89bae5..134e41da0e 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>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/yang-model-validator/pom.xml b/yang/yang-model-validator/pom.xml
index 79cac1184a..d8e6126296 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>bundle-parent</artifactId>
-        <version>4.0.5</version>
+        <version>4.0.7</version>
         <relativePath/>
     </parent>
 
-- 
2.36.6