From ed85d1748aa2ab7ea8b2212fb276b75310096c83 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 21 Jan 2021 16:27:31 +0100 Subject: [PATCH] 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 --- akka/pom.xml | 2 +- akka/repackaged-akka-jar/pom.xml | 2 +- artifacts/pom.xml | 2 +- benchmark/pom.xml | 2 +- bundle-parent/pom.xml | 2 +- docs/pom.xml | 8 ++-- .../features-controller-experimental/pom.xml | 2 +- features/features-controller-testing/pom.xml | 2 +- features/features-controller/pom.xml | 2 +- features/odl-mdsal-clustering-commons/pom.xml | 20 --------- features/pom.xml | 2 +- features/single-feature-parent/pom.xml | 2 +- jolokia/pom.xml | 2 +- karaf/pom.xml | 2 +- model/model-inventory/pom.xml | 2 +- model/pom.xml | 2 +- opendaylight/blueprint/pom.xml | 6 +-- .../netty-event-executor-config/pom.xml | 2 +- .../config/netty-threadgroup-config/pom.xml | 2 +- .../config/netty-timer-config/pom.xml | 2 +- opendaylight/config/pom.xml | 2 +- .../config/threadpool-config-api/pom.xml | 2 +- .../config/threadpool-config-impl/pom.xml | 2 +- opendaylight/md-sal/mdsal-it-base/pom.xml | 4 +- opendaylight/md-sal/mdsal-it-parent/pom.xml | 2 +- opendaylight/md-sal/parent/pom.xml | 2 +- opendaylight/md-sal/pom.xml | 2 +- .../md-sal/sal-akka-segmented-journal/pom.xml | 45 ++++++++++++++++++- .../md-sal/sal-clustering-config/pom.xml | 2 +- .../clustering-test-app/configuration/pom.xml | 2 +- .../samples/clustering-test-app/pom.xml | 2 +- opendaylight/md-sal/samples/pom.xml | 2 +- pom.xml | 2 +- 33 files changed, 80 insertions(+), 59 deletions(-) diff --git a/akka/pom.xml b/akka/pom.xml index db808178b0..84045671f8 100644 --- a/akka/pom.xml +++ b/akka/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/akka/repackaged-akka-jar/pom.xml b/akka/repackaged-akka-jar/pom.xml index e6327975dc..1c4d6f30ad 100644 --- a/akka/repackaged-akka-jar/pom.xml +++ b/akka/repackaged-akka-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 465ca5e994..5b616b2c95 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 1b1215be01..f1832a2db3 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index fd174cde56..3a527c24b4 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal dom-parent - 7.0.4 + 7.0.5 diff --git a/docs/pom.xml b/docs/pom.xml index b1d399d3c7..6ae88d60ce 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 @@ -249,9 +249,9 @@ https://commons.apache.org/proper/commons-lang/javadocs/api-3.9/ https://commons.apache.org/proper/commons-codec/apidocs/ - https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.0.3/ - https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.3/ - https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.4/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.1.0/ + https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.4/ + https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.5/ diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml index dc372bc798..bb1813c71a 100644 --- a/features/features-controller-experimental/pom.xml +++ b/features/features-controller-experimental/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.3 + 8.1.0 diff --git a/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml index 0508e83a50..b2870bc45d 100644 --- a/features/features-controller-testing/pom.xml +++ b/features/features-controller-testing/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.3 + 8.1.0 diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml index 5ec04ca5f4..c2f00515c4 100644 --- a/features/features-controller/pom.xml +++ b/features/features-controller/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-mdsal-clustering-commons/pom.xml b/features/odl-mdsal-clustering-commons/pom.xml index 013f49259b..b11fa1ef99 100644 --- a/features/odl-mdsal-clustering-commons/pom.xml +++ b/features/odl-mdsal-clustering-commons/pom.xml @@ -72,25 +72,5 @@ org.opendaylight.controller sal-akka-segmented-journal - - com.esotericsoftware - kryo - 4.0.2 - - - com.esotericsoftware - minlog - 1.3.1 - - - com.esotericsoftware - reflectasm - 1.11.8 - - - org.ow2.asm - asm - 5.2 - diff --git a/features/pom.xml b/features/pom.xml index c97b10da61..0ebdb20af7 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml index 7dc0992aee..4ab28d2aba 100644 --- a/features/single-feature-parent/pom.xml +++ b/features/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/jolokia/pom.xml b/jolokia/pom.xml index babe91877f..464b153572 100644 --- a/jolokia/pom.xml +++ b/jolokia/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 diff --git a/karaf/pom.xml b/karaf/pom.xml index bcfd445725..de6ffc7e45 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 8.0.3 + 8.1.0 diff --git a/model/model-inventory/pom.xml b/model/model-inventory/pom.xml index d8b5e90b4a..4a58f969b7 100644 --- a/model/model-inventory/pom.xml +++ b/model/model-inventory/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.mdsal binding-parent - 7.0.4 + 7.0.5 diff --git a/model/pom.xml b/model/pom.xml index 60b2078f53..61cfe3c544 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index 32205733b8..a7230ce695 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.3 + 8.1.0 @@ -27,14 +27,14 @@ org.opendaylight.yangtools yangtools-artifacts - 6.0.3 + 6.0.4 pom import org.opendaylight.mdsal mdsal-artifacts - 7.0.4 + 7.0.5 pom import diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml index 581df3e771..dffdecba39 100644 --- a/opendaylight/config/netty-event-executor-config/pom.xml +++ b/opendaylight/config/netty-event-executor-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.3 + 8.1.0 diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml index 65fc7a9da3..00a2cbf3d4 100644 --- a/opendaylight/config/netty-threadgroup-config/pom.xml +++ b/opendaylight/config/netty-threadgroup-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.3 + 8.1.0 diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml index de669c8753..3c477ac649 100644 --- a/opendaylight/config/netty-timer-config/pom.xml +++ b/opendaylight/config/netty-timer-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.3 + 8.1.0 diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 71a5b3b043..359e5aac03 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml index 9ef872c80b..7b2e675220 100644 --- a/opendaylight/config/threadpool-config-api/pom.xml +++ b/opendaylight/config/threadpool-config-api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.3 + 8.1.0 diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml index b2adf1d352..4be0f5a7b7 100644 --- a/opendaylight/config/threadpool-config-impl/pom.xml +++ b/opendaylight/config/threadpool-config-impl/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.3 + 8.1.0 diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml index a7a95a4d5d..be4ca20d23 100644 --- 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 org.opendaylight.odlparent bundle-parent - 8.0.3 + 8.1.0 @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 7.0.4 + 7.0.5 pom import diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index 769620cac5..e510760873 100644 --- 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 org.opendaylight.odlparent bundle-parent - 8.0.3 + 8.1.0 diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index 4ba2455f60..2d2a816ec6 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 7.0.4 + 7.0.5 diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 91c3f6a8fa..74a9e45eff 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml index db2de07727..1435c21f96 100644 --- 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 3.1.5 provided + + com.esotericsoftware + kryo + 4.0.2 + provided + + + com.esotericsoftware + minlog + 1.3.1 + provided + + + com.esotericsoftware + reflectasm + 1.11.8 + provided + + + org.ow2.asm + asm + 5.2 + provided + + + org.objenesis + objenesis + 2.6 + provided + commons-io @@ -87,8 +117,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.groupId}.${project.artifactId} - - *;inline=true;groupId=io.atomix + + !COM.newmonics.*, + !android.os, + * + + + + *;inline=true;groupId=io.atomix, + *;inline=true;groupId=com.esotericsoftware, + *;inline=true;groupId=org.objenesis, + *;inline=true;groupId=org.ow2.asm, + diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index ee60d3bdbb..99470dfe29 100644 --- a/opendaylight/md-sal/sal-clustering-config/pom.xml +++ b/opendaylight/md-sal/sal-clustering-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 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 83bdb7a196..e4efa9970d 100644 --- 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 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml index 8c7fc5d02c..8a9bcbd43c 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml index 19add9430f..4bc39048c0 100644 --- a/opendaylight/md-sal/samples/pom.xml +++ b/opendaylight/md-sal/samples/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/pom.xml b/pom.xml index 155e73086f..aab478ea5d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 -- 2.36.6