From 529a0a9abcfd24d53a2e06f198b85b3fa06389ff Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 17 Jan 2022 22:22:34 +0100 Subject: [PATCH] Bump odlparent to 9.0.11 Pick up latest upgrades from upstream. Change-Id: I94e66ee818a39828e0df3d541a6817c2b304720d Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- benchmarks/pom.xml | 2 +- bundle-parent/pom.xml | 2 +- codec/pom.xml | 2 +- common/mockito-configuration/pom.xml | 2 +- common/pom.xml | 2 +- common/testutils/pom.xml | 2 +- data/pom.xml | 2 +- data/yang-data-tree-api/src/main/java/module-info.java | 1 + data/yang-data-tree-ri/src/main/java/module-info.java | 1 + 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-common/pom.xml | 2 +- features/odl-yangtools-data-api/pom.xml | 2 +- features/odl-yangtools-data/pom.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-parser-api/pom.xml | 2 +- features/odl-yangtools-parser/pom.xml | 2 +- features/odl-yangtools-util/pom.xml | 2 +- features/odl-yangtools-xpath-api/pom.xml | 2 +- features/odl-yangtools-xpath/pom.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- model/pom.xml | 2 +- model/yang-model-ri/src/main/java/module-info.java | 1 + parser/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 +- xpath/pom.xml | 2 +- yang/pom.xml | 2 +- yang/yang-repo-spi/src/main/java/module-info.java | 2 ++ 42 files changed, 43 insertions(+), 38 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 78c6a2910e..594b05d6bf 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 54c4cce01d..3737e5d7fc 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 9.0.10 + 9.0.11 4.0.0 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index 72567038ed..2c97846a47 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 9.0.10 + 9.0.11 diff --git a/codec/pom.xml b/codec/pom.xml index 65cc9a86a7..aafb004c55 100644 --- a/codec/pom.xml +++ b/codec/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml index 2b2eb9b6b1..642f12a0c1 100644 --- a/common/mockito-configuration/pom.xml +++ b/common/mockito-configuration/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 9.0.10 + 9.0.11 diff --git a/common/pom.xml b/common/pom.xml index c644b0fd1f..87a657ad3f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml index 15b16e0779..f7ef9e804b 100644 --- a/common/testutils/pom.xml +++ b/common/testutils/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 9.0.10 + 9.0.11 diff --git a/data/pom.xml b/data/pom.xml index 0ed3a1d011..57a4dd1f0d 100644 --- a/data/pom.xml +++ b/data/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/data/yang-data-tree-api/src/main/java/module-info.java b/data/yang-data-tree-api/src/main/java/module-info.java index 5909b010b7..7cf504f6a4 100644 --- a/data/yang-data-tree-api/src/main/java/module-info.java +++ b/data/yang-data-tree-api/src/main/java/module-info.java @@ -15,4 +15,5 @@ module org.opendaylight.yangtools.yang.data.tree.api { // Annotations requires static transitive org.eclipse.jdt.annotation; + requires static com.github.spotbugs.annotations; } 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 532577533a..11b16e6e6d 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 @@ -23,6 +23,7 @@ module org.opendaylight.yangtools.yang.data.tree { requires org.slf4j; // Annotations + requires static com.github.spotbugs.annotations; requires static org.eclipse.jdt.annotation; requires static org.osgi.service.component.annotations; requires static javax.inject; diff --git a/docs/pom.xml b/docs/pom.xml index f3630ebecc..ed2ad69366 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -388,7 +388,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/9.0.10/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/9.0.11/ diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml index 6f61383cc2..48c79bd828 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 - 9.0.10 + 9.0.11 diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml index bfc53dfd78..27b79905f2 100644 --- a/features/features-yangtools/pom.xml +++ b/features/features-yangtools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml index 7a87c42d23..52300c105c 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml index 0ad3cdadd6..61f6b99a8c 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml index 1147972082..0696ad1a2b 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml index fc32577cc8..3fcbb09869 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-exp-data-xpath-api/pom.xml b/features/odl-yangtools-exp-data-xpath-api/pom.xml index f5c9dce61c..edf84f7d01 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-exp-data-xpath/pom.xml b/features/odl-yangtools-exp-data-xpath/pom.xml index 5359ba29c3..d11a4d3d9c 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml index 94f7dfd19c..6b5c1308f1 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-netty/pom.xml b/features/odl-yangtools-netty/pom.xml index 924f9b924e..d3507cc954 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml index e4bc726740..b0527765e1 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml index affd3b5e26..a05d9cd477 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml index 2f36694682..4cf6d0cc92 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml index 32b84cd3d0..50aeae9a1d 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 - 9.0.10 + 9.0.11 diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml index 1412b09690..146ddf2e2f 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 - 9.0.10 + 9.0.11 diff --git a/features/pom.xml b/features/pom.xml index 9b6d667198..8bdef51ead 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/karaf/pom.xml b/karaf/pom.xml index 1a901e2590..93f5f0c564 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent karaf4-parent - 9.0.10 + 9.0.11 diff --git a/model/pom.xml b/model/pom.xml index b497b76012..af542532cd 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/model/yang-model-ri/src/main/java/module-info.java b/model/yang-model-ri/src/main/java/module-info.java index 23354f5d4a..85d4f25869 100644 --- a/model/yang-model-ri/src/main/java/module-info.java +++ b/model/yang-model-ri/src/main/java/module-info.java @@ -23,4 +23,5 @@ module org.opendaylight.yangtools.yang.model.ri { // Annotations requires static transitive org.eclipse.jdt.annotation; + requires static com.github.spotbugs.annotations; } diff --git a/parser/pom.xml b/parser/pom.xml index efb3a83c19..7cb527b2a9 100644 --- a/parser/pom.xml +++ b/parser/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/plugin/pom.xml b/plugin/pom.xml index e90f4aa1e5..a8eaf93aff 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/plugin/yang-maven-plugin-it/pom.xml b/plugin/yang-maven-plugin-it/pom.xml index edcf48fcf1..7f301c8b22 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 - 9.0.10 + 9.0.11 diff --git a/plugin/yang-maven-plugin-spi/pom.xml b/plugin/yang-maven-plugin-spi/pom.xml index 4dc5f5e3d4..de8c1da90d 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 - 9.0.10 + 9.0.11 diff --git a/plugin/yang-maven-plugin/pom.xml b/plugin/yang-maven-plugin/pom.xml index a93346ce9c..c58fc17602 100644 --- a/plugin/yang-maven-plugin/pom.xml +++ b/plugin/yang-maven-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 9.0.10 + 9.0.11 diff --git a/pom.xml b/pom.xml index 9ddcc8dbe1..c4b49d3e6b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/tools/pom.xml b/tools/pom.xml index 5fb2af2f47..b524bbbd60 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/tools/yang-model-validator/pom.xml b/tools/yang-model-validator/pom.xml index 9df592cbf3..fd9d63b9a8 100644 --- a/tools/yang-model-validator/pom.xml +++ b/tools/yang-model-validator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent - 9.0.10 + 9.0.11 diff --git a/tools/yang-validation-tool/pom.xml b/tools/yang-validation-tool/pom.xml index cc1fea1cdb..469cae71e3 100644 --- a/tools/yang-validation-tool/pom.xml +++ b/tools/yang-validation-tool/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 9.0.10 + 9.0.11 diff --git a/xpath/pom.xml b/xpath/pom.xml index a81c6f4688..56d58475a1 100644 --- a/xpath/pom.xml +++ b/xpath/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/yang/pom.xml b/yang/pom.xml index 497bc53f4f..a8ac24ea89 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.10 + 9.0.11 diff --git a/yang/yang-repo-spi/src/main/java/module-info.java b/yang/yang-repo-spi/src/main/java/module-info.java index 9fd71e1418..f5d5453bd5 100644 --- a/yang/yang-repo-spi/src/main/java/module-info.java +++ b/yang/yang-repo-spi/src/main/java/module-info.java @@ -18,4 +18,6 @@ module org.opendaylight.yangtools.yang.repo.spi { // Annotations requires static transitive org.eclipse.jdt.annotation; + requires static com.github.spotbugs.annotations; + requires static org.checkerframework.checker.qual; } -- 2.36.6