Adopt odlparent-8.1.0/yangtools-6.0.4

Adopt OSGi R7 as well by migrating osgi.core pointers to the new
place.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 3da8201f098b296d2450fa359158952f8721a44d..5a4940ddc6645f378f54ef5d83d771707de8aa7a 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>8.0.3</version>
+      <version>8.1.0</version>
       <relativePath/>
     </parent>
 

diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml
index 6a287ad11c40d0425d9a226c619bd09f6121267e..0b0ec7d46794abc6ed9e961067bd7c5006bbd03d 100644 (file)
--- a/binding/binding-parent/pom.xml
+++ b/binding/binding-parent/pom.xml
@@ -58,7 +58,7 @@
                         <plugin>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>yang-maven-plugin</artifactId>
-                            <version>6.0.3</version>
+                            <version>6.0.4</version>
                             <dependencies>
                                 <dependency>
                                     <groupId>org.opendaylight.mdsal</groupId>

diff --git a/binding/maven-sal-api-gen-plugin/pom.xml b/binding/maven-sal-api-gen-plugin/pom.xml
index ee84ca8526d8ba4a073729dba5343a66b165a0e3..4529aa413f314490455ddbcfc368eccca0f046bd 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/pom.xml
+++ b/binding/maven-sal-api-gen-plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 
@@ -34,7 +34,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>6.0.3</version>
+                <version>6.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml
index f1108f49683d46870a9ddf67f981a7e07d462e12..8f009e0f0268f8b5b84929e03f4a00f7454166eb 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/pom.xml
+++ b/binding/mdsal-binding-dom-adapter/pom.xml
@@ -60,7 +60,11 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.annotation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

diff --git a/binding/mdsal-binding-dom-codec-osgi/pom.xml b/binding/mdsal-binding-dom-codec-osgi/pom.xml
index fcd1c86e416bc760fc79de59d2a0014f0cc3db37..7520ef25d72ff83c9b37f64633bd0818ae8918e9 100644 (file)
--- a/binding/mdsal-binding-dom-codec-osgi/pom.xml
+++ b/binding/mdsal-binding-dom-codec-osgi/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

diff --git a/binding/mdsal-binding-runtime-osgi/pom.xml b/binding/mdsal-binding-runtime-osgi/pom.xml
index aa4f93f9142ea87c2a7037a3644a19ff66f18de1..c01fb45a8ddbd1bdb00e91f0ad0cb1f8d7b90a31 100644 (file)
--- a/binding/mdsal-binding-runtime-osgi/pom.xml
+++ b/binding/mdsal-binding-runtime-osgi/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml
index 4852319699856cea12e468a42e7450e71bdc98b6..8996776db5c1445c628cf091bf2193eb9d589cbb 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/binding/pom.xml b/binding/pom.xml
index 4b6afc2cd1b8e639eaa32e0f5fb332803ae773ce..693c9e02e4eca98c34aeae2b4a4672d67cc1f89d 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index 6e8eb55a4d539741b5b7f28b0b19aab5a43d13c0..9190d9ad2a8f70077ea14ce9971c90bbddeaaace 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index dcc34db2982882e997e2277edf2250e9135b6b25..45225b24dd3052d42f323c09512799bf59e05840 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -456,7 +456,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -618,8 +618,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/8.0.3/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.3/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.1.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.4/</link>
                     </links>
                     <groups>
                         <group>

diff --git a/dom/dom-parent/pom.xml b/dom/dom-parent/pom.xml
index 4dfe2dd462c0828a1b3e1cc4af0d03fcd21dffc2..f056261d7d01d85b037a54ba35fac2875eedbb6a 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>6.0.3</version>
+                <version>6.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -40,6 +40,14 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <!-- FIXME: Remove this with odlparent-8.1.1+ -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>osgi.annotation</artifactId>
+                <version>7.0.0</version>
+                <scope>provided</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/dom/mdsal-dom-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml
index 51ac0a14dc422dea458c7367dc9c85d03ccf7a7e..096772da1dfa39132f34e640a5af58cf86215f2a 100644 (file)
--- a/dom/mdsal-dom-inmemory-datastore/pom.xml
+++ b/dom/mdsal-dom-inmemory-datastore/pom.xml
@@ -60,7 +60,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
 
         <dependency>

diff --git a/dom/mdsal-dom-schema-osgi/pom.xml b/dom/mdsal-dom-schema-osgi/pom.xml
index 20cbe9311e923c23be32bbdaff996aa994054749..3aec3c56cfeea9edc546d5c7d3636ce7cb5972c6 100644 (file)
--- a/dom/mdsal-dom-schema-osgi/pom.xml
+++ b/dom/mdsal-dom-schema-osgi/pom.xml
@@ -42,7 +42,11 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.annotation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

diff --git a/dom/pom.xml b/dom/pom.xml
index 448c7b5f34748fa4cf25fefd3485c123bace586e..4177c1763d063ef392a4c5c79167fed55e7064c9 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/entityownership/pom.xml b/entityownership/pom.xml
index c960a85504ea25904b94149e208d62b9796c2e8f..d9b152d7061894cdad45483095e7cc4189fc1470 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/feature-parent/pom.xml b/features/feature-parent/pom.xml
index 37ee4ec4a29b655ef53fe5b9ce4f8efce935fd56..944ab6e2edcdfc4343d3a736a3620afe64732468 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>6.0.3</version>
+                <version>6.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 93b541ae26dcbc2a9f2ad743c529206da469261d..8456996bb710988a19d151d2ddd8ca3c3c6759a7 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml
index c9bd4939fb826703ae93bc943ba2725d148061a2..3d365ff50f285664a63add96433181259e61d231 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index acc593b294d519f2a9d99cc86f83112be9123709..fd5d181b3a17e2c909900892cba9f814c1bbdca9 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/iana/pom.xml b/model/iana/pom.xml
index 627da7584b3a6006986f37ad0d040257b58e9ddc..560c358ab986577cdba35c724183e96fd52b00f5 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index b6b977d0b0d7264a25cd4652a74ef9cd18f4978b..58d1c1f6cda1700207007ee1e822c3a44065d98d 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index b9132a2d32b381533282ae3922423dc1059cebc2..739345fb673fd0daf43df8876adf01e8536c36af 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/netty/pom.xml b/netty/pom.xml
index b34003aea14c82ae393f2b256ba8ee44339aa77d..61dbb42543bd2527496691a4c49749d8f48277d8 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 0ccf8b9a6a95c7c1c1e1b628d1659894e6d5ca46..7c34f5318da8e48b2a6c142dad778fc233809e62 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/replicate/pom.xml b/replicate/pom.xml
index 338d96cddfa8c624513ad9dd0ba3d10b901d4409..be57b3dbc413d766441a8d3f480d8cbb731fb97a 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml
index d6f5e2da96d358d91021140ed722c70256080479..38764c43098edcde6a1adf34069e1cca76dead4b 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/trace/pom.xml b/trace/pom.xml
index c92810befe73239984ff966a1d22c3b9266833d5..1e84d46ebc96827cbfc705a38e71b3867966e6f9 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/yanglib/pom.xml b/yanglib/pom.xml
index 36b855a939df4988847aecc05afb66b63708f2d7..d43de4572bac471095e7604b838b9f5deb02de3a 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>8.0.3</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>