Bump upstream versions

Adopt following upstreams:
- odlparent-8.1.0
- yangtools-6.0.4
- mdsal-7.0.5

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

diff --git a/akka/pom.xml b/akka/pom.xml
index db808178b094066ace27319d622d6713d1150bbb..84045671f8e29f9f6d0d9125dce41bbd9e6800b4 100644 (file)
--- a/akka/pom.xml
+++ b/akka/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>8.0.3</version>
+        <version>8.1.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/akka/repackaged-akka-jar/pom.xml b/akka/repackaged-akka-jar/pom.xml
index e6327975dccca9f4f0815ea06e3ec2a6dd75cae5..1c4d6f30ad1fdfe50d23f2c895aa5e7f4664a840 100644 (file)
--- a/akka/repackaged-akka-jar/pom.xml
+++ b/akka/repackaged-akka-jar/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>

-        <version>8.0.3</version>
+        <version>8.1.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 465ca5e994c056e3fe71b4a0cf22e5de3e2d6134..5b616b2c95f7eaeec5777802cd1a5ee558b117c6 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>8.0.3</version>
+        <version>8.1.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 1b1215be01e8e971d2d961740d8db00f47f5a535..f1832a2db33448ef45d0cbc59729e40c78be971d 100644 (file)
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index fd174cde56b62e601368c235cf5b19306191fb98..3a527c24b4f977c227356154f70a9cf351df1223 100644 (file)
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>dom-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>dom-parent</artifactId>

-        <version>7.0.4</version>
+        <version>7.0.5</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index b1d399d3c78196a283dc5509445f877c3429c35a..6ae88d60cee7dffdc4a2dfd739073d31af981642 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>

-        <version>8.0.3</version>
+        <version>8.1.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 


@@ -249,9 +249,9 @@
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.9/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.9/</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.mdsal/mdsal-docs/7.0.4/</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>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.5/</link>

                     </links>
                     <groups>
                         <group>
                     </links>
                     <groups>
                         <group>

diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml
index dc372bc798872b1bed23b6fdc9baa7a7c369d0d7..bb1813c71a1a7d3c2ca261a743906b2db42b3e7b 100644 (file)
--- a/features/features-controller-experimental/pom.xml
+++ b/features/features-controller-experimental/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>8.0.3</version>
+        <version>8.1.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml
index 0508e83a5008e48a96fde5908719df78da7e1bba..b2870bc45d226f4df83001dcbc340cde050ca44e 100644 (file)
--- a/features/features-controller-testing/pom.xml
+++ b/features/features-controller-testing/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>8.0.3</version>
+        <version>8.1.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml
index 5ec04ca5f42b19eddb2d24d34fd31f750b010329..c2f00515c4967eb6d12c94fd2daa6a9ef7cffc0c 100644 (file)
--- a/features/features-controller/pom.xml
+++ b/features/features-controller/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>8.0.3</version>
+        <version>8.1.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/odl-mdsal-clustering-commons/pom.xml b/features/odl-mdsal-clustering-commons/pom.xml
index 013f49259bd78c5eb8d4c662c66977f7a3d7f1f2..b11fa1ef99e4021a28896ad842edba8a362468f2 100644 (file)
--- a/features/odl-mdsal-clustering-commons/pom.xml
+++ b/features/odl-mdsal-clustering-commons/pom.xml
@@ -72,25 +72,5 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-akka-segmented-journal</artifactId>
         </dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-akka-segmented-journal</artifactId>
         </dependency>

-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>kryo</artifactId>
-            <version>4.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>minlog</artifactId>
-            <version>1.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>reflectasm</artifactId>
-            <version>1.11.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>5.2</version>
-        </dependency>

     </dependencies>
 </project>
     </dependencies>
 </project>

diff --git a/features/pom.xml b/features/pom.xml
index c97b10da6134288541926af098ebccdef300fad0..0ebdb20af7438adf1c10e862732c4b3b3726ef7c 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml
index 7dc0992aee34446d527d66f97b219547d8a2e6b8..4ab28d2aba5db8969215c8b83ca6392bfd74cc83 100644 (file)
--- a/features/single-feature-parent/pom.xml
+++ b/features/single-feature-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>8.0.3</version>
+        <version>8.1.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/jolokia/pom.xml b/jolokia/pom.xml
index babe91877f6f7609700d85592aef7d2296d273e3..464b1535721d1226c6e5208c0d3cec1f423398a0 100644 (file)
--- a/jolokia/pom.xml
+++ b/jolokia/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index bcfd445725090c180ef4ea29a55c794d6db94876..de6ffc7e45445475d0b48de43875a158b100261c 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/model/model-inventory/pom.xml b/model/model-inventory/pom.xml
index d8b5e90b4a5e6b145a4671af65ae8431e446cc95..4a58f969b789f0a9d845798518a5da6af312b3ea 100644 (file)
--- a/model/model-inventory/pom.xml
+++ b/model/model-inventory/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>

-        <version>7.0.4</version>
+        <version>7.0.5</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index 60b2078f5363d5736c34a0f5a936156f27af460a..61cfe3c54465c6409d944879ecbd41495ea84f76 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>8.0.3</version>
+        <version>8.1.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index 32205733b8513424ee61ed7b08b54c922d1fdb36..a7230ce695a74e867908acdc02bfc9378b6f57e2 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 


@@ -27,14 +27,14 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
       <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>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>

-        <version>7.0.4</version>
+        <version>7.0.5</version>

         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml
index 581df3e771ca35bd6762b27d4d80b5044d9f8278..dffdecba39b926409eee618b914178e93ba37dd6 100644 (file)
--- a/opendaylight/config/netty-event-executor-config/pom.xml
+++ b/opendaylight/config/netty-event-executor-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml
index 65fc7a9da3af7d017fad214e484bfefbbd64721b..00a2cbf3d4fa572de7350922db89179c200431e3 100644 (file)
--- a/opendaylight/config/netty-threadgroup-config/pom.xml
+++ b/opendaylight/config/netty-threadgroup-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml
index de669c875308826b86df79fd61626e67c9852b97..3c477ac649659cceb225ea36047a14aed545d72d 100644 (file)
--- a/opendaylight/config/netty-timer-config/pom.xml
+++ b/opendaylight/config/netty-timer-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 71a5b3b0438166ddcfb1125e91e20a906856781b..359e5aac03c1b97683b20a1507942ef2dedbe16b 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml
index 9ef872c80bb02e7ba1b0b79d80ef359c6f213928..7b2e6752208a63ca9a9ac22b463679b2ea12ea79 100644 (file)
--- a/opendaylight/config/threadpool-config-api/pom.xml
+++ b/opendaylight/config/threadpool-config-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml
index b2adf1d352fe30c6e870f8c5d95b3303ac14d925..4be0f5a7b7135db57a82da6c77dfd26d6d8d66ac 100644 (file)
--- a/opendaylight/config/threadpool-config-impl/pom.xml
+++ b/opendaylight/config/threadpool-config-impl/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index a7a95a4d5de37b07e8f3c09121a36fb4c03c9d03..be4ca20d23e6dc30a2abba5ecf1e3d37ab2e7140 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 


@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>

-        <version>7.0.4</version>
+        <version>7.0.5</version>

         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 769620cac58e68a6fb51be0c8e51f198bb298bbe..e51076087348945cc2d9bac2904e9e0fe2068b1f 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml
index 4ba2455f600b7debffc938f943870cb343c7e8a4..2d2a816ec6382d0d8ce5b26dfc41f43e445976e9 100644 (file)
--- a/opendaylight/md-sal/parent/pom.xml
+++ b/opendaylight/md-sal/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>

-    <version>7.0.4</version>
+    <version>7.0.5</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 91c3f6a8fa5087b512f373ee7c5c32d26187681b..74a9e45eff96f0c8fc53e91150b8c7fff6f592f2 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
index db2de0772787e7bac446bcc2439d71c94f65425e..1435c21f96ff2c700212f62e9e18ca280230bc0c 100644 (file)
--- a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
+++ b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
@@ -70,6 +70,36 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>3.1.5</version>
             <scope>provided</scope>
         </dependency>
             <version>3.1.5</version>
             <scope>provided</scope>
         </dependency>

+        <dependency>
+            <groupId>com.esotericsoftware</groupId>
+            <artifactId>kryo</artifactId>
+            <version>4.0.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.esotericsoftware</groupId>
+            <artifactId>minlog</artifactId>
+            <version>1.3.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.esotericsoftware</groupId>
+            <artifactId>reflectasm</artifactId>
+            <version>1.11.8</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>5.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <version>2.6</version>
+            <scope>provided</scope>
+        </dependency>

 
         <dependency>
             <groupId>commons-io</groupId>
 
         <dependency>
             <groupId>commons-io</groupId>


@@ -87,8 +117,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>

-                        <!-- atomix.io is using an older Guava, so let's embed it to prevent duplicates -->
-                        <Embed-Dependency>*;inline=true;groupId=io.atomix</Embed-Dependency>
+                        <Import-Package>
+                            !COM.newmonics.*,
+                            !android.os,
+                            *
+                        </Import-Package>
+                        <Embed-Dependency>
+                            <!-- atomix.io is using an older Guava, and Kryo is using ancient objenesis,
+                                 so let's embed it to prevent duplicates -->
+                            *;inline=true;groupId=io.atomix,
+                            *;inline=true;groupId=com.esotericsoftware,
+                            *;inline=true;groupId=org.objenesis,
+                            *;inline=true;groupId=org.ow2.asm,
+                        </Embed-Dependency>

                     </instructions>
                 </configuration>
             </plugin>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml
index ee60d3bdbb324f6b4768b1bd8a0e7a46eb14cffe..99470dfe29e181fe71f20e9f8792a7c11bd2eb25 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-config/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
index 83bdb7a1969ed0ec48dc34786eaedd82a596bec2..e4efa9970d037205534fcc34a6b79ca8a80beb78 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>8.0.3</version>
+        <version>8.1.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
index 8c7fc5d02ca0dced8fed39eadaf72e3cd56dccbd..8a9bcbd43cecf0a6e0e9ea4d308437530f745fc6 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>8.0.3</version>
+        <version>8.1.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml
index 19add9430f4e11ff090e1584c1dfa005e784e557..4bc39048c00302c67523d50da14add5793234201 100644 (file)
--- a/opendaylight/md-sal/samples/pom.xml
+++ b/opendaylight/md-sal/samples/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 155e73086f9e38950188c6003272e6a5e6519a79..aab478ea5d10c6a6a03a19c5700308b542f796f5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>8.0.3</version>
+    <version>8.1.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>