From bdda941a974cac4b0d0c46da7a7ce59e76d018b5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 17 Jul 2024 00:43:30 +0200 Subject: [PATCH 1/2] WIP: Bump upstreams for 2024.09 Scandium Adopt: - odlparent-14.0.2 - infrautils-7.0.2 - yangtools-14.0.2 - mdsal-14.0.1 - controller-10.0.1 - aaa-0.20.0-SNAPSHOT - netconf-8.0.0-SNAPSHOT Change-Id: I12aa894658b25ddc8c5a273ac936800d16b442ee Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- features/daexim-features/pom.xml | 2 +- features/odl-daexim-all/pom.xml | 4 ++-- features/odl-daexim-all/src/main/feature/feature.xml | 2 +- features/odl-daexim/pom.xml | 2 +- features/odl-daexim/src/main/feature/feature.xml | 10 +++++----- features/pom.xml | 2 +- .../daexim/impl/DataExportImportAppProvider.java | 2 +- .../org/opendaylight/daexim/impl/ImportTaskTest.java | 4 ++-- .../opendaylight/daexim/impl/LocalExportTaskTest.java | 2 +- .../opendaylight/daexim/impl/ModuleExclusionTest.java | 2 +- .../opendaylight/daexim/impl/PerModuleExportTest.java | 4 ++-- karaf/pom.xml | 2 +- model/pom.xml | 2 +- parent/pom.xml | 6 +++--- pom.xml | 2 +- spi/pom.xml | 2 +- test-model/pom.xml | 2 +- 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 99bead6..e8e8579 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml index 65a436c..0f54d2c 100644 --- a/features/daexim-features/pom.xml +++ b/features/daexim-features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 13.0.11 + 14.0.2 diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index 437a034..a1878b4 100644 --- a/features/odl-daexim-all/pom.xml +++ b/features/odl-daexim-all/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.11 + 14.0.2 org.opendaylight.daexim @@ -34,7 +34,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts pom - 7.0.4 + 8.0.0-SNAPSHOT import diff --git a/features/odl-daexim-all/src/main/feature/feature.xml b/features/odl-daexim-all/src/main/feature/feature.xml index 9c5c88d..df60efd 100644 --- a/features/odl-daexim-all/src/main/feature/feature.xml +++ b/features/odl-daexim-all/src/main/feature/feature.xml @@ -9,6 +9,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - odl-restconf + odl-restconf diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index 5f852ac..bd61d57 100644 --- a/features/odl-daexim/pom.xml +++ b/features/odl-daexim/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 13.0.11 + 14.0.2 org.opendaylight.daexim diff --git a/features/odl-daexim/src/main/feature/feature.xml b/features/odl-daexim/src/main/feature/feature.xml index 6730008..12e3261 100644 --- a/features/odl-daexim/src/main/feature/feature.xml +++ b/features/odl-daexim/src/main/feature/feature.xml @@ -12,10 +12,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html mvn:org.opendaylight.daexim/daexim-impl/${project.version}/cfg - odl-mdsal-binding - odl-mdsal-model-rfc6991 - odl-mdsal-broker - odl-infrautils-ready - odl-infrautils-utils + odl-mdsal-binding + odl-mdsal-model-rfc6991 + odl-mdsal-broker + odl-infrautils-ready + odl-infrautils-utils diff --git a/features/pom.xml b/features/pom.xml index b21796c..296af77 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.daexim diff --git a/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java b/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java index e0eb97c..2bd3886 100644 --- a/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java +++ b/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java @@ -94,9 +94,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.StatusImpo import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.status.export.output.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.status.export.output.NodesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.status.export.output.NodesKey; +import org.opendaylight.yangtools.binding.util.BindingMap; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; diff --git a/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java b/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java index 61846ae..da9918e 100644 --- a/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java +++ b/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java @@ -43,9 +43,9 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; +import org.opendaylight.yangtools.binding.util.BindingMap; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; diff --git a/impl/src/test/java/org/opendaylight/daexim/impl/LocalExportTaskTest.java b/impl/src/test/java/org/opendaylight/daexim/impl/LocalExportTaskTest.java index 5d7bc4c..80a9d7f 100644 --- a/impl/src/test/java/org/opendaylight/daexim/impl/LocalExportTaskTest.java +++ b/impl/src/test/java/org/opendaylight/daexim/impl/LocalExportTaskTest.java @@ -43,8 +43,8 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder; +import org.opendaylight.yangtools.binding.util.BindingMap; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/impl/src/test/java/org/opendaylight/daexim/impl/ModuleExclusionTest.java b/impl/src/test/java/org/opendaylight/daexim/impl/ModuleExclusionTest.java index bb04047..f1722f6 100644 --- a/impl/src/test/java/org/opendaylight/daexim/impl/ModuleExclusionTest.java +++ b/impl/src/test/java/org/opendaylight/daexim/impl/ModuleExclusionTest.java @@ -29,7 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.exclusions import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.exclusions.ExcludedModules.ModuleName; import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.exclusions.ExcludedModulesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.exclusions.ExcludedModulesKey; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; +import org.opendaylight.yangtools.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.QName; public class ModuleExclusionTest extends AbstractDataBrokerTest { diff --git a/impl/src/test/java/org/opendaylight/daexim/impl/PerModuleExportTest.java b/impl/src/test/java/org/opendaylight/daexim/impl/PerModuleExportTest.java index f07628a..4d7049b 100644 --- a/impl/src/test/java/org/opendaylight/daexim/impl/PerModuleExportTest.java +++ b/impl/src/test/java/org/opendaylight/daexim/impl/PerModuleExportTest.java @@ -32,9 +32,9 @@ import org.opendaylight.yang.gen.v1.testa.rev160912.Data2Builder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopologyBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyBuilder; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; +import org.opendaylight.yangtools.binding.util.BindingMap; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/karaf/pom.xml b/karaf/pom.xml index 0ade629..21bbfa9 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 13.0.11 + 14.0.2 org.opendaylight.daexim diff --git a/model/pom.xml b/model/pom.xml index c5d1600..d294f6a 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 13.0.1 + 14.0.1 org.opendaylight.daexim diff --git a/parent/pom.xml b/parent/pom.xml index dfe0ab9..fce5c0b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal bundle-parent - 13.0.1 + 14.0.1 org.opendaylight.daexim @@ -25,13 +25,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.infrautils infrautils-artifacts pom - 6.0.6 + 7.0.2 import org.opendaylight.controller controller-artifacts - 9.0.2 + 10.0.1 pom import diff --git a/pom.xml b/pom.xml index efaedd2..c7afbd9 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 diff --git a/spi/pom.xml b/spi/pom.xml index 795bb05..993c7a7 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 13.0.11 + 14.0.2 org.opendaylight.daexim diff --git a/test-model/pom.xml b/test-model/pom.xml index aeb620d..50ab92f 100644 --- a/test-model/pom.xml +++ b/test-model/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 13.0.1 + 14.0.1 org.opendaylight.daexim -- 2.43.0 From c98ed8c55dd4b99d5298e38daa3b056134e672b1 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Mon, 29 Jul 2024 11:23:25 +0000 Subject: [PATCH 2/2] Release Validate --- akka-infoprovider-impl/pom.xml | 2 +- artifacts/pom.xml | 2 +- features/daexim-features/pom.xml | 2 +- features/odl-daexim-all/pom.xml | 4 ++-- features/odl-daexim/pom.xml | 2 +- features/pom.xml | 2 +- impl/pom.xml | 2 +- karaf/pom.xml | 2 +- model/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- spi/pom.xml | 2 +- test-model/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/akka-infoprovider-impl/pom.xml b/akka-infoprovider-impl/pom.xml index 986587b..b32a1d2 100644 --- a/akka-infoprovider-impl/pom.xml +++ b/akka-infoprovider-impl/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.16.0-SNAPSHOT + 1.16.0 ../parent daexim-akka-infoprovider-impl diff --git a/artifacts/pom.xml b/artifacts/pom.xml index e8e8579..ce3810f 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-artifacts - 1.16.0-SNAPSHOT + 1.16.0 pom diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml index 0f54d2c..009f727 100644 --- a/features/daexim-features/pom.xml +++ b/features/daexim-features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-features - 1.16.0-SNAPSHOT + 1.16.0 feature ODL :: daexim :: ${project.artifactId} diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index a1878b4..d713ce9 100644 --- a/features/odl-daexim-all/pom.xml +++ b/features/odl-daexim-all/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim odl-daexim-all - 1.16.0-SNAPSHOT + 1.16.0 feature OpenDaylight :: Daexim :: All @@ -34,7 +34,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts pom - 8.0.0-SNAPSHOT + 8.0.0 import diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index bd61d57..c608652 100644 --- a/features/odl-daexim/pom.xml +++ b/features/odl-daexim/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim odl-daexim - 1.16.0-SNAPSHOT + 1.16.0 feature OpenDaylight :: daexim (Karaf feature) diff --git a/features/pom.xml b/features/pom.xml index 296af77..981993d 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.daexim features-aggregator - 1.16.0-SNAPSHOT + 1.16.0 pom diff --git a/impl/pom.xml b/impl/pom.xml index d8ca564..b9e221c 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.16.0-SNAPSHOT + 1.16.0 ../parent daexim-impl diff --git a/karaf/pom.xml b/karaf/pom.xml index 21bbfa9..8d549e6 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-karaf - 1.16.0-SNAPSHOT + 1.16.0 pom ${project.artifactId} diff --git a/model/pom.xml b/model/pom.xml index d294f6a..752f76d 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-model bundle - 1.16.0-SNAPSHOT + 1.16.0 diff --git a/parent/pom.xml b/parent/pom.xml index fce5c0b..94d3db5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.16.0-SNAPSHOT + 1.16.0 pom diff --git a/pom.xml b/pom.xml index c7afbd9..0a51281 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html pom org.opendaylight.daexim daexim - 1.16.0-SNAPSHOT + 1.16.0 test-model model diff --git a/spi/pom.xml b/spi/pom.xml index 993c7a7..33487db 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -18,5 +18,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-spi bundle - 1.16.0-SNAPSHOT + 1.16.0 diff --git a/test-model/pom.xml b/test-model/pom.xml index 50ab92f..5ee656c 100644 --- a/test-model/pom.xml +++ b/test-model/pom.xml @@ -18,5 +18,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-test-model bundle - 1.16.0-SNAPSHOT + 1.16.0 -- 2.43.0