From 892aec6cf720f1c748560388cffa7d34d00aed1d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 15:58:12 +0200 Subject: [PATCH 1/3] Clean up javadocs Upgraded checkstyle is finding a number of violations: fix them up. Change-Id: I97440b90aa625556751ae9a74198182cb187accc Signed-off-by: Robert Varga --- .../org/opendaylight/daexim/DataImportBootService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/model/src/main/java/org/opendaylight/daexim/DataImportBootService.java b/model/src/main/java/org/opendaylight/daexim/DataImportBootService.java index b4b069e..2fd76e2 100644 --- a/model/src/main/java/org/opendaylight/daexim/DataImportBootService.java +++ b/model/src/main/java/org/opendaylight/daexim/DataImportBootService.java @@ -12,14 +12,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.StatusImpo /** * Service API for the "auto-import-on-boot" feature. + * * @author Michael Vorburger.ch */ public interface DataImportBootService { - /** * Check last import status, of this node only. Does not return status about * restore operation on per-node basis; see {@link StatusImport} for that. - * This is a very light weight operation (i.e. no data store access & no RPC + * This is a very light weight operation (i.e. no data store access and no RPC * overhead), suitable to be invoked very frequently (contrary to * {@link StatusImport}). */ @@ -34,11 +34,10 @@ public interface DataImportBootService { *
  • If there was a "auto-import-on-boot" but that failed, * then this throws an IllegalStateException. * - * @param blockingWhat name of Class & method being blocked (just for logging) * + * @param blockingWhat name of Class and method being blocked (just for logging) * @deprecated Using {@link DataImportBootReady} is, usually, a better alternative to this */ @Deprecated void awaitBootImport(String blockingWhat); - } -- 2.34.1 From 6d8c6282db9481a1259a7bcbc64266b5d35cac58 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 15:53:57 +0200 Subject: [PATCH 2/3] WIP: Bump upstreams Adopt: - odlparent-15.0.2 - infrautils-8.0.3 - yangtools-16.1.0 - ietf-3.0.1 - mdsal-17.0.1 - controller-14.0.0-SNAPSHOT - netconf-12.0.0-SNAPSHOT // FIXME: non-snapshots Change-Id: I79713f958ae543ceff32a81f755fc42dd8acb0b7 Signed-off-by: Robert Varga --- .../opendaylight/daexim/impl/AkkaNodeNameProvider.java | 6 +++--- artifacts/pom.xml | 2 +- features/daexim-features/pom.xml | 2 +- features/odl-daexim-all/pom.xml | 6 +++--- 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 +- karaf/pom.xml | 2 +- model/pom.xml | 2 +- parent/pom.xml | 6 +++--- pom.xml | 2 +- spi/pom.xml | 2 +- test-model/pom.xml | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/akka-infoprovider-impl/src/main/java/org/opendaylight/daexim/impl/AkkaNodeNameProvider.java b/akka-infoprovider-impl/src/main/java/org/opendaylight/daexim/impl/AkkaNodeNameProvider.java index c31ceed..d489bfd 100644 --- a/akka-infoprovider-impl/src/main/java/org/opendaylight/daexim/impl/AkkaNodeNameProvider.java +++ b/akka-infoprovider-impl/src/main/java/org/opendaylight/daexim/impl/AkkaNodeNameProvider.java @@ -13,7 +13,7 @@ import javax.inject.Singleton; import org.apache.pekko.actor.ActorSystem; import org.apache.pekko.actor.Address; import org.apache.pekko.cluster.Cluster; -import org.opendaylight.controller.cluster.ActorSystemProvider; +import org.opendaylight.controller.pekko.support.ActorSystemInstance; import org.opendaylight.daexim.spi.NodeNameProvider; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -34,8 +34,8 @@ public final class AkkaNodeNameProvider implements NodeNameProvider { @Inject @Activate - public AkkaNodeNameProvider(@Reference final ActorSystemProvider provider) { - actorSystem = provider.getActorSystem(); + public AkkaNodeNameProvider(@Reference final ActorSystemInstance provider) { + actorSystem = provider.actorSystem(); } @Override diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 3e9e33b..b4dad43 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 + 15.0.2 diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml index d23070f..fff31b2 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 + 15.0.2 diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index 1c4b045..d8bc264 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 + 15.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 - 11.0.0 + 12.0.0-SNAPSHOT import @@ -42,7 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf - odl-restconf + odl-restconf-nb xml features diff --git a/features/odl-daexim-all/src/main/feature/feature.xml b/features/odl-daexim-all/src/main/feature/feature.xml index 505c3f3..8947123 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-nb diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index 7159bed..546282f 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 + 15.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 2115171..c975e2c 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-ietf-model-rfc6991 - odl-infrautils-ready - odl-infrautils-utils - odl-mdsal-binding - odl-mdsal-broker + odl-ietf-model-rfc6991 + odl-infrautils-ready + odl-infrautils-utils + odl-mdsal-binding + odl-mdsal-broker diff --git a/features/pom.xml b/features/pom.xml index e1184a5..bb1b352 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 14.3.1 + 15.0.2 org.opendaylight.daexim diff --git a/karaf/pom.xml b/karaf/pom.xml index 0c00252..68df9fc 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 + 15.0.2 org.opendaylight.daexim diff --git a/model/pom.xml b/model/pom.xml index dbb1301..b37b383 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 - 16.0.3 + 17.0.1 org.opendaylight.daexim diff --git a/parent/pom.xml b/parent/pom.xml index 82ba55b..34842f0 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 - 16.0.3 + 17.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 - 7.1.12 + 8.0.3 import org.opendaylight.controller controller-artifacts - 13.0.2 + 14.0.0-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index 57eeb11..c3cc314 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 + 15.0.2 diff --git a/spi/pom.xml b/spi/pom.xml index b948aa4..018713f 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 + 15.0.2 org.opendaylight.daexim diff --git a/test-model/pom.xml b/test-model/pom.xml index c4f52f2..cd2af34 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 - 16.0.3 + 17.0.1 org.opendaylight.daexim -- 2.34.1 From 5fe99f32b968708e7326fbca803c26eb85bc8fc1 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Thu, 17 Sep 2026 14:04:52 +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 | 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 | 4 ++-- pom.xml | 2 +- spi/pom.xml | 2 +- test-model/pom.xml | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/akka-infoprovider-impl/pom.xml b/akka-infoprovider-impl/pom.xml index ed26192..3ede56d 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.20.0-SNAPSHOT + 1.20.0 ../parent daexim-akka-infoprovider-impl diff --git a/artifacts/pom.xml b/artifacts/pom.xml index b4dad43..3411423 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.20.0-SNAPSHOT + 1.20.0 pom diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml index fff31b2..1108f60 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.20.0-SNAPSHOT + 1.20.0 feature ODL :: daexim :: ${project.artifactId} diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index d8bc264..c5b7d4e 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.20.0-SNAPSHOT + 1.20.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 - 12.0.0-SNAPSHOT + 12.0.0 import diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index 546282f..99d9934 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.20.0-SNAPSHOT + 1.20.0 feature OpenDaylight :: daexim (Karaf feature) diff --git a/features/pom.xml b/features/pom.xml index bb1b352..3504b71 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.daexim features-aggregator - 1.20.0-SNAPSHOT + 1.20.0 pom diff --git a/impl/pom.xml b/impl/pom.xml index f0c6815..3e0bac1 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.20.0-SNAPSHOT + 1.20.0 ../parent daexim-impl diff --git a/karaf/pom.xml b/karaf/pom.xml index 68df9fc..8b59f02 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.20.0-SNAPSHOT + 1.20.0 pom ${project.artifactId} diff --git a/model/pom.xml b/model/pom.xml index b37b383..4a676db 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.20.0-SNAPSHOT + 1.20.0 diff --git a/parent/pom.xml b/parent/pom.xml index 34842f0..56d1644 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.20.0-SNAPSHOT + 1.20.0 pom @@ -31,7 +31,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 14.0.0-SNAPSHOT + 14.0.0 pom import diff --git a/pom.xml b/pom.xml index c3cc314..f12b9ce 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.20.0-SNAPSHOT + 1.20.0 test-model model diff --git a/spi/pom.xml b/spi/pom.xml index 018713f..036075d 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.20.0-SNAPSHOT + 1.20.0 diff --git a/test-model/pom.xml b/test-model/pom.xml index cd2af34..a9ab7b0 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.20.0-SNAPSHOT + 1.20.0 -- 2.34.1