From: Robert Varga Date: Sat, 9 Apr 2022 19:17:56 +0000 (+0200) Subject: Bump odlparent to 10.0.1 X-Git-Tag: v8.0.4~10 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=c056341221e413b47f1b1575e33ea958e77889dc Bump odlparent to 10.0.1 Pick up latest upgrades from upstream. This requires fixing up JPMS module references, as metainf-services added (finally) an Automatic-Module-Name declaration. Change-Id: I914ec18ad583e347b7a2707cefbca37d9307741c Signed-off-by: Robert Varga --- diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 0ac33756d3..1f9e2d7fc2 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1 diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 7d9d4fd81b..29fa5f7df4 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 10.0.0 + 10.0.1 4.0.0 diff --git a/bnd-parent/pom.xml b/bnd-parent/pom.xml index 8a2b4e6d4c..a1a294198a 100644 --- a/bnd-parent/pom.xml +++ b/bnd-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bnd-parent - 10.0.0 + 10.0.1 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index 97507c42c6..168e6dfeab 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 10.0.0 + 10.0.1 diff --git a/codec/pom.xml b/codec/pom.xml index 6bfa988166..789abbadd1 100644 --- a/codec/pom.xml +++ b/codec/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1 diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml index 46522b50cd..003915cb7d 100644 --- a/common/mockito-configuration/pom.xml +++ b/common/mockito-configuration/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 10.0.0 + 10.0.1 diff --git a/common/pom.xml b/common/pom.xml index 907098f227..db9b7eedc6 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1 diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml index 14036cff2d..da49bad4bd 100644 --- a/common/testutils/pom.xml +++ b/common/testutils/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 10.0.0 + 10.0.1 diff --git a/data/pom.xml b/data/pom.xml index bc5fc4ea9e..d91f41f461 100644 --- a/data/pom.xml +++ b/data/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1 diff --git a/data/yang-data-tree-ri/src/main/java/module-info.java b/data/yang-data-tree-ri/src/main/java/module-info.java index 11b16e6e6d..27ce4d3805 100644 --- a/data/yang-data-tree-ri/src/main/java/module-info.java +++ b/data/yang-data-tree-ri/src/main/java/module-info.java @@ -25,7 +25,7 @@ module org.opendaylight.yangtools.yang.data.tree { // Annotations requires static com.github.spotbugs.annotations; requires static org.eclipse.jdt.annotation; + requires static org.kohsuke.metainf_services; requires static org.osgi.service.component.annotations; requires static javax.inject; - requires static metainf.services; } diff --git a/docs/pom.xml b/docs/pom.xml index bd62799af1..57f6cdae38 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -385,7 +385,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/10.0.0/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/10.0.1/ diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml index d90ef490a9..6559f4215e 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 - 10.0.0 + 10.0.1 diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml index f3d6f74ed4..f5f931bce9 100644 --- a/features/features-yangtools/pom.xml +++ b/features/features-yangtools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 10.0.0 + 10.0.1 diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml index dac55d67b3..9443445fd3 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 - 10.0.0 + 10.0.1 diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml index 9e73d34d1e..12e4da9d89 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 - 10.0.0 + 10.0.1 diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml index d677194d7e..4378869366 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 - 10.0.0 + 10.0.1 diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml index 6183c6cd10..145c66f5a1 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 - 10.0.0 + 10.0.1 diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml index 15d9149bc9..f23f48a220 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 - 10.0.0 + 10.0.1 diff --git a/features/odl-yangtools-netty/pom.xml b/features/odl-yangtools-netty/pom.xml index 3ab6ad1e61..510af209fe 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 - 10.0.0 + 10.0.1 diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml index dcd6f39bd8..4178abfdc3 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 - 10.0.0 + 10.0.1 diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml index 48f050b7e2..6725743833 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 - 10.0.0 + 10.0.1 diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml index b0d509b73d..b7d2e75cdd 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 - 10.0.0 + 10.0.1 diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml index 9d8f3841f0..863468ae1f 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 - 10.0.0 + 10.0.1 diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml index dd7a9b6d42..02a85801ad 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 - 10.0.0 + 10.0.1 diff --git a/features/pom.xml b/features/pom.xml index cdfbddd7c6..8732ef93fc 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1 diff --git a/karaf/pom.xml b/karaf/pom.xml index e16c7e37b8..e8e07746ef 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent karaf4-parent - 10.0.0 + 10.0.1 diff --git a/model/pom.xml b/model/pom.xml index 911f75a68e..b965f9fbf5 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1 diff --git a/parser/pom.xml b/parser/pom.xml index 2cae9889bf..5d719d7a38 100644 --- a/parser/pom.xml +++ b/parser/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1 diff --git a/plugin/pom.xml b/plugin/pom.xml index cb4c33135c..80c4e23265 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1 diff --git a/plugin/yang-maven-plugin-it/pom.xml b/plugin/yang-maven-plugin-it/pom.xml index 352d5e61a6..eb17884e5a 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 - 10.0.0 + 10.0.1 diff --git a/plugin/yang-maven-plugin-spi/pom.xml b/plugin/yang-maven-plugin-spi/pom.xml index 787e9e2f0f..5fcc78df4b 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 - 10.0.0 + 10.0.1 diff --git a/plugin/yang-maven-plugin/pom.xml b/plugin/yang-maven-plugin/pom.xml index 2efb50b52f..a41c2955c8 100644 --- a/plugin/yang-maven-plugin/pom.xml +++ b/plugin/yang-maven-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 10.0.0 + 10.0.1 diff --git a/pom.xml b/pom.xml index 1fe286e6d7..cb2ba01e4b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1 diff --git a/tools/pom.xml b/tools/pom.xml index 9215ac2b11..0db9f84f41 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1 diff --git a/tools/yang-model-validator/pom.xml b/tools/yang-model-validator/pom.xml index 18bdbcef9f..a7633ab564 100644 --- a/tools/yang-model-validator/pom.xml +++ b/tools/yang-model-validator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent - 10.0.0 + 10.0.1 diff --git a/tools/yang-validation-tool/pom.xml b/tools/yang-validation-tool/pom.xml index 9982dcf0f1..7d08a16684 100644 --- a/tools/yang-validation-tool/pom.xml +++ b/tools/yang-validation-tool/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 10.0.0 + 10.0.1 diff --git a/xpath/pom.xml b/xpath/pom.xml index 488df2dec0..a8849d7fd7 100644 --- a/xpath/pom.xml +++ b/xpath/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1 diff --git a/xpath/yang-xpath-impl/src/main/java/module-info.java b/xpath/yang-xpath-impl/src/main/java/module-info.java index 8ecdf8eec5..2d3f20932f 100644 --- a/xpath/yang-xpath-impl/src/main/java/module-info.java +++ b/xpath/yang-xpath-impl/src/main/java/module-info.java @@ -22,7 +22,7 @@ module org.opendaylight.yangtools.yang.xpath.impl { // Annotations requires static com.github.spotbugs.annotations; requires static javax.inject; - requires static metainf.services; + requires static org.kohsuke.metainf_services; requires static org.eclipse.jdt.annotation; requires static org.osgi.service.component.annotations; } diff --git a/yang/pom.xml b/yang/pom.xml index 49827820aa..9aa1b6647f 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 10.0.1