Bump upstreams

Adopt:
- odlparent-10.0.2
- yangtools-8.0.4

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 2feda3387ab848413337fdb8818a17b930fd4446..59004bc913d94d9b2ce0b175df0f4ee02e9fa806 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>10.0.0</version>
+      <version>10.0.2</version>
       <relativePath/>
     </parent>
 

diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml
index af826b9d8a614ded5baabf0a6697ae4189a81ef1..ea2b0b89cfac892466b7085be781fd12c168be27 100644 (file)
--- a/binding/binding-parent/pom.xml
+++ b/binding/binding-parent/pom.xml
@@ -54,7 +54,7 @@
                         <plugin>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>yang-maven-plugin</artifactId>
-                            <version>8.0.3</version>
+                            <version>8.0.4</version>
                             <dependencies>
                                 <dependency>
                                     <groupId>org.opendaylight.mdsal</groupId>

diff --git a/binding/mdsal-binding-generator/src/main/java/module-info.java b/binding/mdsal-binding-generator/src/main/java/module-info.java
index 11b8bfcf011e5a737805b051f30b80be952a0e93..4d641e39fe3e10163dcef66a9df9603ff7b4dbe4 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/module-info.java
+++ b/binding/mdsal-binding-generator/src/main/java/module-info.java
@@ -36,6 +36,6 @@ module org.opendaylight.mdsal.binding.generator {
     requires static transitive org.eclipse.jdt.annotation;
     requires static com.github.spotbugs.annotations;
     requires static javax.inject;
-    requires static metainf.services;
+    requires static org.kohsuke.metainf_services;
     requires static org.osgi.service.component.annotations;
 }

diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml
index 198d2db99741294a19625098b510c9521e3973b9..905d32a5360110caae0cdfdfc8f91505047da31c 100644 (file)
--- a/binding/mdsal-binding-test-utils/pom.xml
+++ b/binding/mdsal-binding-test-utils/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/binding/pom.xml b/binding/pom.xml
index e7177641c0506a1c8c8462d67b300099d7792ba7..b5b17fb8690ef8ad18a5cd48d13ae131fbfa0ed3 100644 (file)
--- a/binding/pom.xml
+++ b/binding/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/binding/yang-binding/pom.xml b/binding/yang-binding/pom.xml
index 8b7d24f474e948a660ebb309c520424497a3291c..add331d3f440b096b365fe4f059011a5c36f12a0 100644 (file)
--- a/binding/yang-binding/pom.xml
+++ b/binding/yang-binding/pom.xml
@@ -39,6 +39,11 @@
             <artifactId>guava</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-reflect</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
index 4383d10e216776b627987fdd0ed136ed3dd6add2..52bbda9ee4df5698e0786d7c04bd87aeb6a04e5a 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>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index 7c0e7197f5a1c71c374d487b728f761c6a3b10bc..61a7b2d4a66904c4f847087c51655c617992038e 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -615,8 +615,8 @@
                         <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/10.0.0/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/8.0.3/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/10.0.2/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/8.0.4/</link>
                     </links>
                     <groups>
                         <group>

diff --git a/dom/dom-parent/pom.xml b/dom/dom-parent/pom.xml
index 579d50ee359c4acb943a51116fdfd11214668026..15bad61c2578a02957329fc0244bf0e99d858ca2 100644 (file)
--- a/dom/dom-parent/pom.xml
+++ b/dom/dom-parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>8.0.3</version>
+                <version>8.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/dom/pom.xml b/dom/pom.xml
index d7c48f7266829550752060500d3cefb9aedcd321..03d70ecd45d52c4d85a30144f0af4b414935e6b3 100644 (file)
--- a/dom/pom.xml
+++ b/dom/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java b/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java
index 6b0d7d896bbed94e4d58c6fc4e1671f594d0c7ad..071ed4efc101f2c9d38186f688e9a08fd43093b3 100644 (file)
--- a/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java
+++ b/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java
@@ -22,6 +22,6 @@ module org.opendaylight.mdsal.eos.dom.simple {
     requires static org.eclipse.jdt.annotation;
     requires static org.checkerframework.checker.qual;
     requires static javax.inject;
-    requires static metainf.services;
+    requires static org.kohsuke.metainf_services;
     requires static org.osgi.service.component.annotations;
 }

diff --git a/entityownership/pom.xml b/entityownership/pom.xml
index 51945953af1c58dfe87ef4219c3cc7dfd1ada43e..88cfc72419590508b06fd6c9f22d69374ede41f9 100644 (file)
--- a/entityownership/pom.xml
+++ b/entityownership/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/feature-parent/pom.xml b/features/feature-parent/pom.xml
index 47f7d1878246d1d6a0c867fdc2f2c009aa96759d..f144d18db1bdec2479047b1921812d45d93f9c51 100644 (file)
--- a/features/feature-parent/pom.xml
+++ b/features/feature-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>8.0.3</version>
+                <version>8.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/features-mdsal-experimental/pom.xml b/features/features-mdsal-experimental/pom.xml
index e084a3f6e8d1c777f32332011546cc2bca66ef25..f083bd5d6bb5a3a554664fc3292ea2e8bd3fab81 100644 (file)
--- a/features/features-mdsal-experimental/pom.xml
+++ b/features/features-mdsal-experimental/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml
index 8a2d11258b0e161a8e4a3982f64d4f3b9f12151f..fca056291eae97d19f07563de244a0d9b9dcc290 100644 (file)
--- a/features/features-mdsal/pom.xml
+++ b/features/features-mdsal/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 2ce510144b2b2a9280911a17e185bf9e030e63eb..7a649137c4989676c159a19f3203cdda40bd5ae0 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 1a36178fe5be91cc2ba6a865918ef2e246416447..ac3c74705deb7d3d5757b21fce126e8d290d6434 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
 </parent>
 

diff --git a/model/iana/pom.xml b/model/iana/pom.xml
index e8009348ad7bdee9e5c25a4554d2f998dfc9201a..e46c84a751ae8c77eca9afab1ec0d0fb9bf5c0c3 100644 (file)
--- a/model/iana/pom.xml
+++ b/model/iana/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index c2cc7d8fbc0d7af7f1addc62441b0ae92464464c..558bc1734288094962b1c5f5bbb32edf93ad2704 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index 0eff2ae1d97aca61e66e5326be4d3a59b11efd53..8280ab13e7f6a691d25f66c332bad76168a06c0f 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/netty/pom.xml b/netty/pom.xml
index 5a1a33b6c812adf1d592890f79a11ea244d49e0b..ce9f1791a3f8dd32145600b56d50ec57f4dde768 100644 (file)
--- a/netty/pom.xml
+++ b/netty/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 54afe5bce2c81eafadaa9038b950d2b25bf4e76a..83ee5281ffad13d1b570d8df894bf62e2dab8ff6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/replicate/pom.xml b/replicate/pom.xml
index fb8d055865d7f74173f27cac65194d2d5fa05b11..f71a5eed4cb30f4319384fce97b82c6786598088 100644 (file)
--- a/replicate/pom.xml
+++ b/replicate/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/module-info.java b/singleton-service/mdsal-singleton-dom-impl/src/main/java/module-info.java
index 664be7ba9ce3f36d8abece0641258fca9bcf078e..fcb4c9fcc4c0b6555f3e15415335bb69b60c17ea 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/module-info.java
+++ b/singleton-service/mdsal-singleton-dom-impl/src/main/java/module-info.java
@@ -25,7 +25,7 @@ module org.opendaylight.mdsal.singleton.dom.impl {
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
     requires static javax.inject;
-    requires static metainf.services;
     requires static org.checkerframework.checker.qual;
+    requires static org.kohsuke.metainf_services;
     requires static org.osgi.service.component.annotations;
 }

diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml
index bde9d87bbe8cb1545455ed88b6c97f410a604716..1967050c5f0fa25b891156205091675a8892afaa 100644 (file)
--- a/singleton-service/pom.xml
+++ b/singleton-service/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/trace/pom.xml b/trace/pom.xml
index d4c498536477b7da969884209bab7723d0509808..4e3bff807a93cf940956e3edb92615fa67c58936 100644 (file)
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/yanglib/pom.xml b/yanglib/pom.xml
index 1d7f40b9d621a6395dd32acba46a478f7616144f..f4d2f8b3d1a98b1c5f4e5746a0960f91c04f4b1c 100644 (file)
--- a/yanglib/pom.xml
+++ b/yanglib/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>