From: Robert Varga Date: Sat, 23 Apr 2022 11:17:03 +0000 (+0200) Subject: Bump odlparent to 11.0.0-SNAPSHOT X-Git-Tag: v9.0.0~128 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=95822b1839adb9e238c094c9c14ab11c58a5124e Bump odlparent to 11.0.0-SNAPSHOT Pick up odlparent-11 for JDK17 work. Change-Id: Idaadaf47505020b161bcf285e17da439d5d9375d Signed-off-by: Robert Varga --- diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 4157ef4507..21dd8691bd 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 6c18c9a4e6..29dbd4be2e 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 10.0.0 + 11.0.0-SNAPSHOT 4.0.0 diff --git a/bnd-parent/pom.xml b/bnd-parent/pom.xml index 98a10f9230..b9e62d10f7 100644 --- a/bnd-parent/pom.xml +++ b/bnd-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bnd-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index 84fa99371f..4a84959d8b 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/codec/pom.xml b/codec/pom.xml index aae04143ca..47bb451e85 100644 --- a/codec/pom.xml +++ b/codec/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml index 75a9339f1c..0acd24ee90 100644 --- a/common/mockito-configuration/pom.xml +++ b/common/mockito-configuration/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index ff7128f5ff..0ffb582984 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml index 61ce65053d..0b5d830ed3 100644 --- a/common/testutils/pom.xml +++ b/common/testutils/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/data/pom.xml b/data/pom.xml index e6ba34468d..2da640ff2e 100644 --- a/data/pom.xml +++ b/data/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT 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 ac43917313..59de3ef821 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/11.0.0-SNAPSHOT/ diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml index 884beccf64..dd1d730fb8 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 + 11.0.0-SNAPSHOT diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml index 8dc63d0eee..6baca54e22 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml index 87e2dbe8b8..ec4cca9243 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-codec/src/main/feature/feature.xml b/features/odl-yangtools-codec/src/main/feature/feature.xml index c7122de582..3f04b3bce1 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 b0c146545b..a4c41ed46f 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml index 2b269abcf8..862950aca0 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml index ef41bce4b9..9981428fb8 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-data/src/main/feature/feature.xml b/features/odl-yangtools-data/src/main/feature/feature.xml index 9ea3ca68da..a895c30081 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-export/pom.xml b/features/odl-yangtools-export/pom.xml index 3a2405a71e..e7ea160628 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-netty/pom.xml b/features/odl-yangtools-netty/pom.xml index 0fb46d6b2b..b09dd0d0f9 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-netty/src/main/feature/feature.xml b/features/odl-yangtools-netty/src/main/feature/feature.xml index 84b16e43b3..f61d4e2de0 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 9b9e6eac71..af997bf43c 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml index dbb355fa4f..f6eaac71a4 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-parser/src/main/feature/feature.xml b/features/odl-yangtools-parser/src/main/feature/feature.xml index 8575f5284e..2aeafd7eb1 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 36e5101cea..a795215146 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-util/src/main/feature/feature.xml b/features/odl-yangtools-util/src/main/feature/feature.xml index 7b8a427f04..4168aac4ca 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 4542f5f317..632e0a20c8 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml index 52eb8bfddc..3768c0870f 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 + 11.0.0-SNAPSHOT diff --git a/features/odl-yangtools-xpath/src/main/feature/feature.xml b/features/odl-yangtools-xpath/src/main/feature/feature.xml index e6732601c8..c7d2f9f17e 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 766890ab1c..91c7feadfc 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/karaf/pom.xml b/karaf/pom.xml index ec2c51f441..a03e3bf971 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent karaf4-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/model/pom.xml b/model/pom.xml index 5d01a2cdee..2c72bf7bae 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/parser/pom.xml b/parser/pom.xml index c4d42699b4..e671d7e4dc 100644 --- a/parser/pom.xml +++ b/parser/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/plugin/pom.xml b/plugin/pom.xml index a31de7927a..0219efbaf9 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/plugin/yang-maven-plugin-it/pom.xml b/plugin/yang-maven-plugin-it/pom.xml index 3cb2717d99..77df2e56d8 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 + 11.0.0-SNAPSHOT diff --git a/plugin/yang-maven-plugin-spi/pom.xml b/plugin/yang-maven-plugin-spi/pom.xml index 162ec91f3e..a41df122d1 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 + 11.0.0-SNAPSHOT diff --git a/plugin/yang-maven-plugin/pom.xml b/plugin/yang-maven-plugin/pom.xml index 8da52b0050..ce9e12b33b 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 + 11.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 928db7d025..91edf7434f 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/tools/pom.xml b/tools/pom.xml index f10fa5f394..22417426aa 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/tools/yang-model-validator/pom.xml b/tools/yang-model-validator/pom.xml index fc5af39758..bfbbb53c7a 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 + 11.0.0-SNAPSHOT diff --git a/tools/yang-validation-tool/pom.xml b/tools/yang-validation-tool/pom.xml index cfe8b5fc92..76926f5766 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 + 11.0.0-SNAPSHOT diff --git a/xpath/pom.xml b/xpath/pom.xml index a1d5b2e007..f35d73efae 100644 --- a/xpath/pom.xml +++ b/xpath/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT 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..2dd0c08780 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.eclipse.jdt.annotation; + requires static org.kohsuke.metainf_services; requires static org.osgi.service.component.annotations; } diff --git a/yang/pom.xml b/yang/pom.xml index 3329b03581..e5ccfc7fad 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT