From 713b5aece72d6f1ab8552b7b5aa111b86447d2a1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 21 Jan 2021 14:03:27 +0100 Subject: [PATCH] Adopt odlparent-8.1.0 Pick up latest version, which introduces OSGi R7 and a few other relevant updates. Change-Id: I2ee2bded604ce7a8aedc5dcc9de1b03930c4e70f Signed-off-by: Robert Varga --- 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 | 2 +- features/features-yangtools-experimental/pom.xml | 2 +- features/features-yangtools/pom.xml | 2 +- features/odl-yangtools-codec/pom.xml | 2 +- features/odl-yangtools-codec/src/main/feature/feature.xml | 4 ++-- 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-data/src/main/feature/feature.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-netty/src/main/feature/feature.xml | 2 +- features/odl-yangtools-parser-api/pom.xml | 2 +- features/odl-yangtools-parser/pom.xml | 2 +- features/odl-yangtools-parser/src/main/feature/feature.xml | 2 +- features/odl-yangtools-util/pom.xml | 2 +- features/odl-yangtools-util/src/main/feature/feature.xml | 2 +- features/odl-yangtools-xpath-api/pom.xml | 2 +- features/odl-yangtools-xpath/pom.xml | 2 +- features/odl-yangtools-xpath/src/main/feature/feature.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 +- 40 files changed, 41 insertions(+), 41 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 511014e6d8..08ef9e398a 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/attic/pom.xml b/attic/pom.xml index 03d0177ea9..12ba600736 100644 --- a/attic/pom.xml +++ b/attic/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index ea60dc8cb4..94cc6c28f4 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 4.0.0 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index 72c9ba8212..5412fa7188 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.3 + 8.1.0 diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml index 0f26edbe3c..e4a38bcf35 100644 --- a/common/mockito-configuration/pom.xml +++ b/common/mockito-configuration/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 diff --git a/common/pom.xml b/common/pom.xml index 32e996e1e9..bd097ce179 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml index a919356d3e..8519a4ba52 100644 --- a/common/testutils/pom.xml +++ b/common/testutils/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 8.0.3 + 8.1.0 diff --git a/docs/pom.xml b/docs/pom.xml index 4b3d0e5b29..36fbd96839 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -355,7 +355,7 @@ https://commons.apache.org/proper/commons-lang/javadocs/api-3.10/ 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.odlparent/odlparent-docs/8.1.0/ diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml index 038cb614e6..b61ca502e0 100644 --- a/features/features-yangtools-experimental/pom.xml +++ b/features/features-yangtools-experimental/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.3 + 8.1.0 diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml index 7d78d219bc..c4bc24ff58 100644 --- a/features/features-yangtools/pom.xml +++ b/features/features-yangtools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml index 65fc3d42d2..feb08e404e 100644 --- a/features/odl-yangtools-codec/pom.xml +++ b/features/odl-yangtools-codec/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-codec/src/main/feature/feature.xml b/features/odl-yangtools-codec/src/main/feature/feature.xml index 09b821ee54..a90b282c6e 100644 --- a/features/odl-yangtools-codec/src/main/feature/feature.xml +++ b/features/odl-yangtools-codec/src/main/feature/feature.xml @@ -1,7 +1,7 @@ - odl-gson - odl-stax2-api + odl-gson + odl-stax2-api diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml index 1becc00413..80acadaede 100644 --- a/features/odl-yangtools-common/pom.xml +++ b/features/odl-yangtools-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml index a80ff1ecde..7a1643cc82 100644 --- a/features/odl-yangtools-data-api/pom.xml +++ b/features/odl-yangtools-data-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml index c9f57db459..89698907c7 100644 --- a/features/odl-yangtools-data/pom.xml +++ b/features/odl-yangtools-data/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-data/src/main/feature/feature.xml b/features/odl-yangtools-data/src/main/feature/feature.xml index 2f8ea54a05..0e3a90436b 100644 --- a/features/odl-yangtools-data/src/main/feature/feature.xml +++ b/features/odl-yangtools-data/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-antlr4 + odl-antlr4 diff --git a/features/odl-yangtools-exp-data-xpath-api/pom.xml b/features/odl-yangtools-exp-data-xpath-api/pom.xml index e88e493f12..3c5a470643 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 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-exp-data-xpath/pom.xml b/features/odl-yangtools-exp-data-xpath/pom.xml index fa20162da0..96717f9af2 100644 --- a/features/odl-yangtools-exp-data-xpath/pom.xml +++ b/features/odl-yangtools-exp-data-xpath/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml index 0119c3b5a6..93c2d26d09 100644 --- a/features/odl-yangtools-export/pom.xml +++ b/features/odl-yangtools-export/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-netty/pom.xml b/features/odl-yangtools-netty/pom.xml index e7184251e6..0095c15e9d 100644 --- a/features/odl-yangtools-netty/pom.xml +++ b/features/odl-yangtools-netty/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-netty/src/main/feature/feature.xml b/features/odl-yangtools-netty/src/main/feature/feature.xml index 3c15df9781..305d0c5e24 100644 --- a/features/odl-yangtools-netty/src/main/feature/feature.xml +++ b/features/odl-yangtools-netty/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-netty-4 + odl-netty-4 diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml index 7507c5d6c1..114ec965c8 100644 --- a/features/odl-yangtools-parser-api/pom.xml +++ b/features/odl-yangtools-parser-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml index 6294aa4d55..086f62d04a 100644 --- a/features/odl-yangtools-parser/pom.xml +++ b/features/odl-yangtools-parser/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-parser/src/main/feature/feature.xml b/features/odl-yangtools-parser/src/main/feature/feature.xml index abf14fd72a..eec1623f19 100644 --- a/features/odl-yangtools-parser/src/main/feature/feature.xml +++ b/features/odl-yangtools-parser/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-antlr4 + odl-antlr4 diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml index 5f5128ee8e..14560233ee 100644 --- a/features/odl-yangtools-util/pom.xml +++ b/features/odl-yangtools-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-util/src/main/feature/feature.xml b/features/odl-yangtools-util/src/main/feature/feature.xml index f0bca2ac14..24d0e100d4 100644 --- a/features/odl-yangtools-util/src/main/feature/feature.xml +++ b/features/odl-yangtools-util/src/main/feature/feature.xml @@ -1,7 +1,7 @@ - odl-guava + odl-guava pt-triemap diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml index dd31a7f8bb..3403dca63b 100644 --- a/features/odl-yangtools-xpath-api/pom.xml +++ b/features/odl-yangtools-xpath-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml index bce9a4620f..c450e186b1 100644 --- a/features/odl-yangtools-xpath/pom.xml +++ b/features/odl-yangtools-xpath/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.3 + 8.1.0 diff --git a/features/odl-yangtools-xpath/src/main/feature/feature.xml b/features/odl-yangtools-xpath/src/main/feature/feature.xml index 5f849d3f56..8a7f6d6346 100644 --- a/features/odl-yangtools-xpath/src/main/feature/feature.xml +++ b/features/odl-yangtools-xpath/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-antlr4 + odl-antlr4 diff --git a/features/pom.xml b/features/pom.xml index 6b48c79661..18b7db6fe7 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/karaf/pom.xml b/karaf/pom.xml index 23c783a3b8..6df5b7541d 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent karaf4-parent - 8.0.3 + 8.1.0 diff --git a/plugin/pom.xml b/plugin/pom.xml index 454adee3b4..5355541e6f 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/plugin/yang-maven-plugin-it/pom.xml b/plugin/yang-maven-plugin-it/pom.xml index 207a4257c6..7fe4f1f85b 100644 --- a/plugin/yang-maven-plugin-it/pom.xml +++ b/plugin/yang-maven-plugin-it/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 diff --git a/plugin/yang-maven-plugin-spi/pom.xml b/plugin/yang-maven-plugin-spi/pom.xml index ef893514c7..70981d3960 100644 --- a/plugin/yang-maven-plugin-spi/pom.xml +++ b/plugin/yang-maven-plugin-spi/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 diff --git a/plugin/yang-maven-plugin/pom.xml b/plugin/yang-maven-plugin/pom.xml index 56bda36e77..9c2b32cc14 100644 --- a/plugin/yang-maven-plugin/pom.xml +++ b/plugin/yang-maven-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 diff --git a/pom.xml b/pom.xml index 280b824855..8cbc62b10e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/tools/pom.xml b/tools/pom.xml index aedbd3cb62..c853ffc7b3 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 diff --git a/tools/yang-model-validator/pom.xml b/tools/yang-model-validator/pom.xml index 049fc3bdab..fd80e3c2a9 100644 --- a/tools/yang-model-validator/pom.xml +++ b/tools/yang-model-validator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 diff --git a/tools/yang-validation-tool/pom.xml b/tools/yang-validation-tool/pom.xml index c8742e28ed..2dccd3026d 100644 --- a/tools/yang-validation-tool/pom.xml +++ b/tools/yang-validation-tool/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 8.0.3 + 8.1.0 diff --git a/yang/pom.xml b/yang/pom.xml index 8db22d0faa..bd3170ec07 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.3 + 8.1.0 -- 2.36.6