From 2d58df6e0da9e44d16bc9c77eaf56928b05ca5f7 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 6 Nov 2020 11:07:26 +0100
Subject: [PATCH] Bump odlparent to 8.0.1

Pick up latest upgrades, allowing us to ditch a few declarations.

Change-Id: I5ace375fd8d746f13fa7eb83a525203503b3cf33
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                 | 2 +-
 attic/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 +-
 docs/pom.xml                                      | 7 ++++++-
 features/features-yangtools-experimental/pom.xml  | 2 +-
 features/features-yangtools/pom.xml               | 2 +-
 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-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-parser-api/pom.xml         | 2 +-
 features/odl-yangtools-parser/pom.xml             | 2 +-
 features/odl-yangtools-util/pom.xml               | 2 +-
 features/odl-yangtools-xpath-api/pom.xml          | 2 +-
 features/odl-yangtools-xpath/pom.xml              | 2 +-
 features/pom.xml                                  | 2 +-
 karaf/pom.xml                                     | 2 +-
 plugin/pom.xml                                    | 2 +-
 plugin/yang-maven-plugin-it/pom.xml               | 2 +-
 plugin/yang-maven-plugin-spi/pom.xml              | 2 +-
 plugin/yang-maven-plugin/pom.xml                  | 2 +-
 pom.xml                                           | 2 +-
 tools/pom.xml                                     | 2 +-
 tools/yang-model-validator/pom.xml                | 2 +-
 tools/yang-validation-tool/pom.xml                | 2 +-
 yang/pom.xml                                      | 2 +-
 yang/yang-xpath-impl/pom.xml                      | 4 ----
 35 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 776a6f0e88..ef560132ca 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>8.0.0</version>
+      <version>8.0.1</version>
       <relativePath/>
     </parent>
 
diff --git a/attic/pom.xml b/attic/pom.xml
index f0eab2b459..20b52a054c 100644
--- a/attic/pom.xml
+++ b/attic/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 4dc1da1955..2cbabc936d 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index 54c92d7eb3..ddba4f308c 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml
index b58c97f528..faec9e4b63 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/common/pom.xml b/common/pom.xml
index 8301ce6756..48bcf0bd9c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>8.0.0</version>
+      <version>8.0.1</version>
       <relativePath/>
     </parent>
 
diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml
index 725bf8e7bd..6667c153a8 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/docs/pom.xml b/docs/pom.xml
index e480dedb3c..b345b72017 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -221,6 +221,11 @@
             <artifactId>osgi.cmpn</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
@@ -355,7 +360,7 @@
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.10/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.0.1/</link>
                     </links>
                     <groups>
                         <group>
diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml
index cd454b16d3..0498584dd1 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml
index b594387e2b..6c57e60cb4 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml
index c8b22b8388..189d9e68ae 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml
index 781e391073..ba0d5c5691 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml
index a0d55efa14..87b4c0b251 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml
index 089b537bdc..0dd5730747 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>8.0.0</version>
+        <version>8.0.1</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 867eeecfc0..a6c43ee31e 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-exp-data-xpath/pom.xml b/features/odl-yangtools-exp-data-xpath/pom.xml
index f9145b2a59..08bf642fc9 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml
index dfe496f653..63d1270d4b 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-netty/pom.xml b/features/odl-yangtools-netty/pom.xml
index 2e3a7c055e..321dcf997a 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml
index 71e8e5fe1e..347e90aec2 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml
index ba7a381b50..c7b891a7e9 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml
index 68cc107c11..81c09ddc7c 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml
index b85dd05630..026f9221d4 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml
index 39568d2450..c381f25248 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>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index ba8afb002c..ccdad30097 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 52d7228083..4f14146b50 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 87f5540cc7..b20fc003c0 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/plugin/yang-maven-plugin-it/pom.xml b/plugin/yang-maven-plugin-it/pom.xml
index 9b7ec9ac0f..9b575f371c 100644
--- a/plugin/yang-maven-plugin-it/pom.xml
+++ b/plugin/yang-maven-plugin-it/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/plugin/yang-maven-plugin-spi/pom.xml b/plugin/yang-maven-plugin-spi/pom.xml
index 7bb01a62e1..b1411a4267 100644
--- a/plugin/yang-maven-plugin-spi/pom.xml
+++ b/plugin/yang-maven-plugin-spi/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/plugin/yang-maven-plugin/pom.xml b/plugin/yang-maven-plugin/pom.xml
index 558255996c..2bd29b90ff 100644
--- a/plugin/yang-maven-plugin/pom.xml
+++ b/plugin/yang-maven-plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 08d1377143..a251a0ad46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>8.0.0</version>
+      <version>8.0.1</version>
       <relativePath/>
     </parent>
 
diff --git a/tools/pom.xml b/tools/pom.xml
index df91535c4c..0019f2a3eb 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/tools/yang-model-validator/pom.xml b/tools/yang-model-validator/pom.xml
index 93e9073121..c1dcfd37dc 100644
--- a/tools/yang-model-validator/pom.xml
+++ b/tools/yang-model-validator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/tools/yang-validation-tool/pom.xml b/tools/yang-validation-tool/pom.xml
index d022e4c6a0..a5c6ca1c38 100644
--- a/tools/yang-validation-tool/pom.xml
+++ b/tools/yang-validation-tool/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/pom.xml b/yang/pom.xml
index f633e85a12..d0a8c7d2e4 100644
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/yang/yang-xpath-impl/pom.xml b/yang/yang-xpath-impl/pom.xml
index 445f697882..7e9c5ee3c4 100644
--- a/yang/yang-xpath-impl/pom.xml
+++ b/yang/yang-xpath-impl/pom.xml
@@ -51,15 +51,11 @@
         <dependency>
             <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
-            <version>1.0.19.9</version>
-            <scope>provided</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.component.annotations</artifactId>
-            <version>1.3.0</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
-- 
2.36.6