From f79bfdeb20f8c70956d5ce9eac06ae327017cdf5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 13 Aug 2026 00:28:42 +0200 Subject: [PATCH 1/3] Use List.sort() Lists have a built-in sorting capability, drop use of Collections.sort(). Change-Id: I86cc6d009dda0efee314ebc7b2b638d9c1d82b7e Signed-off-by: Robert Varga --- impl/src/main/java/org/opendaylight/daexim/impl/Util.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/impl/src/main/java/org/opendaylight/daexim/impl/Util.java b/impl/src/main/java/org/opendaylight/daexim/impl/Util.java index 2f76d91..48b91e4 100644 --- a/impl/src/main/java/org/opendaylight/daexim/impl/Util.java +++ b/impl/src/main/java/org/opendaylight/daexim/impl/Util.java @@ -28,7 +28,6 @@ import java.nio.file.Path; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Arrays; -import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Properties; @@ -193,8 +192,7 @@ public final class Util { // collect all json files related to given datastore dataFiles.putAll(dst, collectDatastoreFiles(daeximDir, dst)); // sort them to honor order during import - final List unsorted = dataFiles.get(dst); - Collections.sort(unsorted, (f1, f2) -> f1.getAbsolutePath().length() - f2.getAbsolutePath().length()); + dataFiles.get(dst).sort((f1, f2) -> f1.getAbsolutePath().length() - f2.getAbsolutePath().length()); } return dataFiles; } -- 2.34.1 From 096192d1ba31c4224c27441a4e51f120e79a4e2d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 12 Aug 2026 21:31:54 +0200 Subject: [PATCH 2/3] Bump upstreams Adopt: - odlparent-14.3.7 - infrautils-7.1.14 - yangtools-14.0.25 - mdsal-14.0.22 - controller-11.0.5 - netconf-9.0.3 Change-Id: I7adb9974716f7546f377bb01c9744e9f674fd11c 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/pom.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- model/pom.xml | 2 +- parent/pom.xml | 6 +++--- pom.xml | 2 +- spi/pom.xml | 2 +- test-model/pom.xml | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 010e2b7..d5fd480 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 - 14.3.1 + 14.3.7 diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml index 572be76..6178a76 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 - 14.3.1 + 14.3.7 diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index fa84ced..caed432 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 - 14.3.1 + 14.3.7 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 - 9.0.2 + 9.0.3 import diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index a2f6d77..84500b1 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 - 14.3.1 + 14.3.7 org.opendaylight.daexim diff --git a/features/pom.xml b/features/pom.xml index a96bf8e..4781d10 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 14.3.1 + 14.3.7 org.opendaylight.daexim diff --git a/karaf/pom.xml b/karaf/pom.xml index 41860d0..4e60896 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 - 14.3.1 + 14.3.7 org.opendaylight.daexim diff --git a/model/pom.xml b/model/pom.xml index 599700f..d6969c6 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 - 14.0.21 + 14.0.22 org.opendaylight.daexim diff --git a/parent/pom.xml b/parent/pom.xml index 0adbefa..95db1a5 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 - 14.0.21 + 14.0.22 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 - 7.1.12 + 7.1.14 import org.opendaylight.controller controller-artifacts - 11.0.4 + 11.0.5 pom import diff --git a/pom.xml b/pom.xml index cfb22e9..57c0cb1 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 - 14.3.1 + 14.3.7 diff --git a/spi/pom.xml b/spi/pom.xml index 661b016..683d7be 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 - 14.3.1 + 14.3.7 org.opendaylight.daexim diff --git a/test-model/pom.xml b/test-model/pom.xml index 4238253..0e9d3c6 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 - 14.0.21 + 14.0.22 org.opendaylight.daexim -- 2.34.1 From eec3779f164d65b46c4ec563a46500ebc286eddd Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Wed, 12 Aug 2026 22:32:12 +0000 Subject: [PATCH 3/3] Release Validate --- akka-infoprovider-impl/pom.xml | 2 +- artifacts/pom.xml | 2 +- features/daexim-features/pom.xml | 2 +- features/odl-daexim-all/pom.xml | 2 +- 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, 13 insertions(+), 13 deletions(-) diff --git a/akka-infoprovider-impl/pom.xml b/akka-infoprovider-impl/pom.xml index c090b2b..07057ea 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.17.3-SNAPSHOT + 1.17.3 ../parent daexim-akka-infoprovider-impl diff --git a/artifacts/pom.xml b/artifacts/pom.xml index d5fd480..1ab1593 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.17.3-SNAPSHOT + 1.17.3 pom diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml index 6178a76..9b7dc1a 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.17.3-SNAPSHOT + 1.17.3 feature ODL :: daexim :: ${project.artifactId} diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index caed432..db254e0 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.17.3-SNAPSHOT + 1.17.3 feature OpenDaylight :: Daexim :: All diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index 84500b1..4ae1274 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.17.3-SNAPSHOT + 1.17.3 feature OpenDaylight :: daexim (Karaf feature) diff --git a/features/pom.xml b/features/pom.xml index 4781d10..dcef38d 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.daexim features-aggregator - 1.17.3-SNAPSHOT + 1.17.3 pom diff --git a/impl/pom.xml b/impl/pom.xml index 41a2b6e..cc4181b 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.17.3-SNAPSHOT + 1.17.3 ../parent daexim-impl diff --git a/karaf/pom.xml b/karaf/pom.xml index 4e60896..1e76419 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.17.3-SNAPSHOT + 1.17.3 pom ${project.artifactId} diff --git a/model/pom.xml b/model/pom.xml index d6969c6..989be66 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.17.3-SNAPSHOT + 1.17.3 diff --git a/parent/pom.xml b/parent/pom.xml index 95db1a5..fd3fba0 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.17.3-SNAPSHOT + 1.17.3 pom diff --git a/pom.xml b/pom.xml index 57c0cb1..b0ec6d8 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.17.3-SNAPSHOT + 1.17.3 test-model model diff --git a/spi/pom.xml b/spi/pom.xml index 683d7be..2733795 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.17.3-SNAPSHOT + 1.17.3 diff --git a/test-model/pom.xml b/test-model/pom.xml index 0e9d3c6..4a0a76d 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.17.3-SNAPSHOT + 1.17.3 -- 2.34.1