From acc18537076307d8bb85d8e78ec0f6345cea4836 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 13 Jun 2024 19:37:46 +0200 Subject: [PATCH] Bump upstreams Adopt: - odlparent-14.0.0-SNAPSHOT - yangtools-14.0.0-SNAPSHOT The reason for the use of snapshots is early Java 21 integration and the move of binding components. Change-Id: Idde79245dcf64c49e3722c0bf03b87ba44c5fcbd Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- binding/binding-parent/pom.xml | 2 +- .../mdsal-binding-dom-adapter/src/main/java/module-info.java | 2 +- binding/mdsal-binding-test-utils/pom.xml | 2 +- binding/pom.xml | 2 +- bnd-parent/pom.xml | 2 +- bundle-parent/pom.xml | 2 +- common/pom.xml | 2 +- docs/pom.xml | 2 +- dom/pom.xml | 2 +- entityownership/pom.xml | 2 +- features/feature-parent/pom.xml | 4 ++-- features/features-mdsal-experimental/pom.xml | 2 +- features/features-mdsal/pom.xml | 2 +- features/odl-mdsal-binding-api/src/main/feature/feature.xml | 2 +- features/odl-mdsal-binding-base/src/main/feature/feature.xml | 2 +- .../src/main/feature/feature.xml | 4 ++-- features/odl-mdsal-common/src/main/feature/feature.xml | 2 +- features/odl-mdsal-dom-api/src/main/feature/feature.xml | 2 +- features/odl-mdsal-eos-common/src/main/feature/feature.xml | 2 +- .../odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml | 2 +- .../odl-mdsal-replicate-netty/src/main/feature/feature.xml | 4 ++-- features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- model/iana/pom.xml | 2 +- model/ietf/pom.xml | 2 +- model/pom.xml | 2 +- netty/pom.xml | 2 +- pom.xml | 2 +- replicate/pom.xml | 2 +- singleton-service/pom.xml | 2 +- trace/pom.xml | 2 +- yanglib/pom.xml | 2 +- 34 files changed, 37 insertions(+), 37 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 58554efe8d..9ab7bf4df5 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml index 1de86dd599..877241d411 100644 --- a/binding/binding-parent/pom.xml +++ b/binding/binding-parent/pom.xml @@ -72,7 +72,7 @@ org.opendaylight.yangtools yang-maven-plugin - 13.0.6 + 14.0.0-SNAPSHOT org.opendaylight.mdsal diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/module-info.java b/binding/mdsal-binding-dom-adapter/src/main/java/module-info.java index a172daef3a..e4f237c609 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/module-info.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/module-info.java @@ -30,6 +30,7 @@ module org.opendaylight.mdsal.binding.dom.adapter { requires transitive org.opendaylight.mdsal.binding.dom.codec.spi; requires transitive org.opendaylight.mdsal.dom.api; requires transitive org.opendaylight.yangtools.yang.data.impl; + requires com.google.common.util.concurrent.internal; requires org.opendaylight.mdsal.binding.dom.codec.api; requires org.opendaylight.mdsal.binding.runtime.api; requires org.opendaylight.mdsal.binding.spec.util; @@ -40,7 +41,6 @@ module org.opendaylight.mdsal.binding.dom.adapter { requires org.opendaylight.yangtools.yang.data.spi; requires org.opendaylight.yangtools.yang.model.api; requires org.slf4j; - requires failureaccess; // OSGi is optional requires static org.osgi.framework; diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml index 7f377c5465..b597354255 100644 --- a/binding/mdsal-binding-test-utils/pom.xml +++ b/binding/mdsal-binding-test-utils/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/binding/pom.xml b/binding/pom.xml index 3f043d9d8e..a669250e0a 100644 --- a/binding/pom.xml +++ b/binding/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/bnd-parent/pom.xml b/bnd-parent/pom.xml index b7e1558371..591d648838 100644 --- a/bnd-parent/pom.xml +++ b/bnd-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools bnd-parent - 13.0.6 + 14.0.0-SNAPSHOT diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index 517d756127..ec6c3b22c1 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools bundle-parent - 13.0.6 + 14.0.0-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index afc6c07568..686adb198b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index e9d4949864..45cd259ca0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -587,7 +587,7 @@ https://guava.dev/releases/32.1.2-jre/api/docs/ https://commons.apache.org/proper/commons-lang/javadocs/api-release/ - https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.1.3/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/14.0.0-SNAPSHOT/ https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/13.0.2/ diff --git a/dom/pom.xml b/dom/pom.xml index 2dfa9ad3dc..c49c9fa1db 100644 --- a/dom/pom.xml +++ b/dom/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/entityownership/pom.xml b/entityownership/pom.xml index 84a91d52dd..576402fd80 100644 --- a/entityownership/pom.xml +++ b/entityownership/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/features/feature-parent/pom.xml b/features/feature-parent/pom.xml index 446532c293..bd6d099ad3 100644 --- a/features/feature-parent/pom.xml +++ b/features/feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 13.1.3 + 14.0.0-SNAPSHOT @@ -27,7 +27,7 @@ org.opendaylight.yangtools yangtools-artifacts - 13.0.6 + 14.0.0-SNAPSHOT pom import diff --git a/features/features-mdsal-experimental/pom.xml b/features/features-mdsal-experimental/pom.xml index f8387973fa..01c21f966b 100644 --- a/features/features-mdsal-experimental/pom.xml +++ b/features/features-mdsal-experimental/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml index 0b56b7ca22..b676ebfdcf 100644 --- a/features/features-mdsal/pom.xml +++ b/features/features-mdsal/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/features/odl-mdsal-binding-api/src/main/feature/feature.xml b/features/odl-mdsal-binding-api/src/main/feature/feature.xml index d316d875d9..99a908dbdd 100644 --- a/features/odl-mdsal-binding-api/src/main/feature/feature.xml +++ b/features/odl-mdsal-binding-api/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-data-api + odl-yangtools-data-api diff --git a/features/odl-mdsal-binding-base/src/main/feature/feature.xml b/features/odl-mdsal-binding-base/src/main/feature/feature.xml index 4b948cf74a..7299dd29de 100644 --- a/features/odl-mdsal-binding-base/src/main/feature/feature.xml +++ b/features/odl-mdsal-binding-base/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-common + odl-yangtools-common diff --git a/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml b/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml index 01e5171e58..3d5dbfe409 100644 --- a/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml +++ b/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml @@ -1,7 +1,7 @@ - odl-yangtools-data - odl-yangtools-parser + odl-yangtools-data + odl-yangtools-parser diff --git a/features/odl-mdsal-common/src/main/feature/feature.xml b/features/odl-mdsal-common/src/main/feature/feature.xml index d3257d3697..d4fcd04e1d 100644 --- a/features/odl-mdsal-common/src/main/feature/feature.xml +++ b/features/odl-mdsal-common/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-common + odl-yangtools-common diff --git a/features/odl-mdsal-dom-api/src/main/feature/feature.xml b/features/odl-mdsal-dom-api/src/main/feature/feature.xml index b264cda5fe..8aac86ef57 100644 --- a/features/odl-mdsal-dom-api/src/main/feature/feature.xml +++ b/features/odl-mdsal-dom-api/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-data-api + odl-yangtools-data-api diff --git a/features/odl-mdsal-eos-common/src/main/feature/feature.xml b/features/odl-mdsal-eos-common/src/main/feature/feature.xml index 04fcd00c6c..86985eb082 100644 --- a/features/odl-mdsal-eos-common/src/main/feature/feature.xml +++ b/features/odl-mdsal-eos-common/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-data-api + odl-yangtools-data-api diff --git a/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml b/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml index cec4bd16ee..8233815f50 100644 --- a/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml +++ b/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-data-api + odl-yangtools-data-api diff --git a/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml b/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml index ce337af671..22d4209a54 100644 --- a/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml +++ b/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml @@ -3,7 +3,7 @@ mvn:org.opendaylight.mdsal/mdsal-replicate-netty/${project.version}/config/sink mvn:org.opendaylight.mdsal/mdsal-replicate-netty/${project.version}/config/source - odl-netty-4 - odl-yangtools-codec + odl-netty-4 + odl-yangtools-codec diff --git a/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml b/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml index 18a66a0240..15d287bec5 100644 --- a/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml +++ b/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-netty + odl-yangtools-netty diff --git a/features/pom.xml b/features/pom.xml index 698ff8a373..af3b5d7f40 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/karaf/pom.xml b/karaf/pom.xml index d7b908bbcb..48c7b04dd3 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/model/iana/pom.xml b/model/iana/pom.xml index 3ac6c689e8..9bb76de87f 100644 --- a/model/iana/pom.xml +++ b/model/iana/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index e0438593fe..f43a0a1044 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/model/pom.xml b/model/pom.xml index 8df4908dd0..4b22c78865 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/netty/pom.xml b/netty/pom.xml index 6cc635ffff..a13cf5810b 100644 --- a/netty/pom.xml +++ b/netty/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index ea38948d83..241e89ef6e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/replicate/pom.xml b/replicate/pom.xml index a98eac7c32..ebe9b7fad9 100644 --- a/replicate/pom.xml +++ b/replicate/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml index 3d4a92e4e6..e5db54bd02 100644 --- a/singleton-service/pom.xml +++ b/singleton-service/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/trace/pom.xml b/trace/pom.xml index aee9ac049c..118e34720a 100644 --- a/trace/pom.xml +++ b/trace/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT diff --git a/yanglib/pom.xml b/yanglib/pom.xml index e9f8a71253..98c665fd50 100644 --- a/yanglib/pom.xml +++ b/yanglib/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 14.0.0-SNAPSHOT -- 2.36.6