From 637cc0efd7ac106214a00fe163205f772cf9c482 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 14 Nov 2025 18:02:45 +0100 Subject: [PATCH 1/4] Fix annotation positions ErrorProne is pointing out misplaced annotations, fix them up. Change-Id: Ia3ae9985459ccfa5efbc40f3ca8f8226022cc138 Signed-off-by: Robert Varga --- .../jsonrpc/bus/jsonrpc/JsonRpcBaseMessage.java | 12 ++++-------- .../bus/jsonrpc/JsonRpcBaseRequestMessage.java | 6 ++---- .../jsonrpc/bus/jsonrpc/JsonRpcErrorMessage.java | 6 ++---- .../jsonrpc/bus/jsonrpc/JsonRpcReplyMessage.java | 6 ++---- .../opendaylight/jsonrpc/dom/codec/DataCodec.java | 3 --- .../org/opendaylight/jsonrpc/dom/codec/RpcCodec.java | 4 +--- 6 files changed, 11 insertions(+), 26 deletions(-) diff --git a/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcBaseMessage.java b/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcBaseMessage.java index b2375127..8769e906 100644 --- a/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcBaseMessage.java +++ b/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcBaseMessage.java @@ -62,18 +62,15 @@ public abstract class JsonRpcBaseMessage { this.metadata = builder.metadata; } - @NonNull - public String getJsonrpc() { + public @NonNull String getJsonrpc() { return jsonrpc; } - @Nullable - public JsonObject getMetadata() { + public @Nullable JsonObject getMetadata() { return metadata; } - @Nullable - public JsonElement getId() { + public @Nullable JsonElement getId() { return id; } @@ -195,8 +192,7 @@ public abstract class JsonRpcBaseMessage { return VERSION.equals(version) || VERSION_SHORT.equals(version); } - @NonNull - public abstract JsonRpcMessageType getType(); + public abstract @NonNull JsonRpcMessageType getType(); public abstract static class AbstractBuilder, M extends JsonRpcBaseMessage> { private String jsonrpc; diff --git a/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcBaseRequestMessage.java b/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcBaseRequestMessage.java index 904ace1a..0684f6de 100644 --- a/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcBaseRequestMessage.java +++ b/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcBaseRequestMessage.java @@ -28,13 +28,11 @@ public abstract class JsonRpcBaseRequestMessage extends JsonRpcBaseMessage { this.params = builder.params; } - @NonNull - public String getMethod() { + public @NonNull String getMethod() { return method; } - @Nullable - public JsonElement getParams() { + public @Nullable JsonElement getParams() { return params; } diff --git a/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcErrorMessage.java b/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcErrorMessage.java index 185fdf40..dc7159d2 100644 --- a/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcErrorMessage.java +++ b/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcErrorMessage.java @@ -34,8 +34,7 @@ public final class JsonRpcErrorMessage extends JsonRpcBaseMessage { this.data = builder.data; } - @NonNull - public String getMessage() { + public @NonNull String getMessage() { return message; } @@ -43,8 +42,7 @@ public final class JsonRpcErrorMessage extends JsonRpcBaseMessage { return code; } - @Nullable - public JsonElement getData() { + public @Nullable JsonElement getData() { return data; } diff --git a/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcReplyMessage.java b/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcReplyMessage.java index 46a14d79..08fbcf33 100644 --- a/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcReplyMessage.java +++ b/bus/jsonrpc/src/main/java/org/opendaylight/jsonrpc/bus/jsonrpc/JsonRpcReplyMessage.java @@ -38,8 +38,7 @@ public final class JsonRpcReplyMessage extends JsonRpcBaseMessage { return error != null; } - @Nullable - public JsonElement getResult() { + public @Nullable JsonElement getResult() { return result; } @@ -56,8 +55,7 @@ public final class JsonRpcReplyMessage extends JsonRpcBaseMessage { return convertJsonElementToClass(getResult(), type); } - @Nullable - public JsonRpcErrorObject getError() { + public @Nullable JsonRpcErrorObject getError() { return error; } diff --git a/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/DataCodec.java b/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/DataCodec.java index 2c10457f..a1fb61d0 100644 --- a/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/DataCodec.java +++ b/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/DataCodec.java @@ -15,7 +15,6 @@ import java.io.IOException; import java.io.StringWriter; import java.util.Objects; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -90,7 +89,6 @@ class DataCodec extends AbstractCodec implements Codec { this.type = type; } - @Nullable @Override public ContainerNode deserialize(JsonElement input) throws IOException { LOG.trace("[decode][{}][{}] input : {}", shortName, type, input); @@ -77,4 +75,4 @@ class RpcCodec extends RpcNotificationBaseCodec { LOG.trace("[encode][{}][{}] result : {}", shortName, type, result); return result; } -} \ No newline at end of file +} -- 2.34.1 From 8cf99a97ad4e232c90f2f28152e4592c626735ca Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 14 Nov 2025 18:07:58 +0100 Subject: [PATCH 2/4] Use assertThrows() in RpcCodecTest ErrorProne is pointing out deprecated checks for throws. Modernize here. Change-Id: Ia203f9070c6b9bf9d50b4d684193f991a5459aa1 Signed-off-by: Robert Varga --- .../org/opendaylight/jsonrpc/dom/codec/RpcCodecTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/RpcCodecTest.java b/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/RpcCodecTest.java index 459c35a9..fe3b79ef 100644 --- a/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/RpcCodecTest.java +++ b/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/RpcCodecTest.java @@ -12,6 +12,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import com.google.gson.JsonArray; @@ -58,14 +59,16 @@ public class RpcCodecTest extends AbstractCodecTest { assertThat(encoded.toString(), hasJsonPath("$.in-number", equalTo(6))); } - @Test(expected = IllegalArgumentException.class) + @Test public void testInputArrayMismatchArguments() throws IOException { final Codec codec = factory.rpcInputCodec(getRpc("factorial")); final JsonArray arr = new JsonArray(); arr.add(1); arr.add(2); arr.add(3); - codec.deserialize(arr); + final var ex = assertThrows(IllegalArgumentException.class, () -> codec.deserialize(arr)); + assertEquals("Number of input array elements (3) does not match number of child schema nodes (1)", + ex.getMessage()); } @Test @@ -85,7 +88,7 @@ public class RpcCodecTest extends AbstractCodecTest { assertEquals(F_INPUT, encoded); } - private RpcDefinition getRpc(String name) { + private RpcDefinition getRpc(final String name) { return schemaContext.getOperations() .stream() .filter(rpc -> rpc.getQName().getLocalName().equals(name)) -- 2.34.1 From a1a66029f0477039660185e28b7b9c869be407ce Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 13:11:15 +0200 Subject: [PATCH 3/4] Bump upstreams Adopt: - odlparent-14.1.6 - yangtools-14.0.20 - infrautils-7.1.9 - ietf-1.0.2 - mdsal-15.0.2 - controller-12.0.2 - netconf-10.0.1 Change-Id: I661996645eb5f4ca4404faf9a072566051d8b2e4 Signed-off-by: Robert Varga --- api/pom.xml | 4 ++-- artifacts/pom.xml | 2 +- binding-adapter/pom.xml | 2 +- bus/config/pom.xml | 2 +- bus/examples/binding-bridge/pom.xml | 4 ++-- features/features-jsonrpc/pom.xml | 2 +- features/odl-jsonrpc-all/pom.xml | 2 +- features/odl-jsonrpc-all/src/main/feature/feature.xml | 2 +- features/odl-jsonrpc-bus/pom.xml | 6 +++--- features/odl-jsonrpc-bus/src/main/feature/feature.xml | 4 ++-- features/odl-jsonrpc-cluster/pom.xml | 2 +- .../odl-jsonrpc-cluster/src/main/feature/feature.xml | 4 ++-- features/odl-jsonrpc-provider/pom.xml | 2 +- .../odl-jsonrpc-provider/src/main/feature/feature.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- parent/pom.xml | 6 +++--- pom.xml | 2 +- provider/cluster/pom.xml | 6 +++--- .../jsonrpc/provider/cluster/TestCustomizer.java | 10 +++++++++- provider/common/pom.xml | 2 +- .../jsonrpc/impl/DataChangeListenerRegistration.java | 2 +- provider/pom.xml | 2 +- provider/single/pom.xml | 2 +- test-model/pom.xml | 4 ++-- 25 files changed, 44 insertions(+), 36 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 5cc799cd..cd177063 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -20,11 +20,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html JSON-RPC :: API - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-inet-types - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-yang-types diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 4d4bcd38..1d8213e1 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.1.3 + 14.1.6 org.opendaylight.jsonrpc diff --git a/binding-adapter/pom.xml b/binding-adapter/pom.xml index 1ed83efd..2038ee86 100644 --- a/binding-adapter/pom.xml +++ b/binding-adapter/pom.xml @@ -152,7 +152,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html test - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-yang-types diff --git a/bus/config/pom.xml b/bus/config/pom.xml index 54df4886..3ca55432 100644 --- a/bus/config/pom.xml +++ b/bus/config/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 14.1.3 + 14.1.6 diff --git a/bus/examples/binding-bridge/pom.xml b/bus/examples/binding-bridge/pom.xml index 0e20cd2d..22943b31 100644 --- a/bus/examples/binding-bridge/pom.xml +++ b/bus/examples/binding-bridge/pom.xml @@ -111,11 +111,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html mdsal-binding-dom-adapter - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-yang-types - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-inet-types diff --git a/features/features-jsonrpc/pom.xml b/features/features-jsonrpc/pom.xml index 56147ab4..07569a33 100644 --- a/features/features-jsonrpc/pom.xml +++ b/features/features-jsonrpc/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 14.1.3 + 14.1.6 diff --git a/features/odl-jsonrpc-all/pom.xml b/features/odl-jsonrpc-all/pom.xml index 1e73068f..2a98c91c 100644 --- a/features/odl-jsonrpc-all/pom.xml +++ b/features/odl-jsonrpc-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.1.3 + 14.1.6 diff --git a/features/odl-jsonrpc-all/src/main/feature/feature.xml b/features/odl-jsonrpc-all/src/main/feature/feature.xml index c9d2bcbd..63a1860d 100644 --- a/features/odl-jsonrpc-all/src/main/feature/feature.xml +++ b/features/odl-jsonrpc-all/src/main/feature/feature.xml @@ -8,7 +8,7 @@ --> - odl-restconf-openapi + odl-restconf-openapi diff --git a/features/odl-jsonrpc-bus/pom.xml b/features/odl-jsonrpc-bus/pom.xml index 7b37fe7e..c4924a8d 100644 --- a/features/odl-jsonrpc-bus/pom.xml +++ b/features/odl-jsonrpc-bus/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.1.3 + 14.1.6 @@ -89,8 +89,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html features - org.opendaylight.mdsal.model - odl-mdsal-model-rfc6991 + org.opendaylight.ietf + odl-ietf-model-rfc6991 xml features diff --git a/features/odl-jsonrpc-bus/src/main/feature/feature.xml b/features/odl-jsonrpc-bus/src/main/feature/feature.xml index 03ea3cee..d17e41f0 100644 --- a/features/odl-jsonrpc-bus/src/main/feature/feature.xml +++ b/features/odl-jsonrpc-bus/src/main/feature/feature.xml @@ -12,8 +12,8 @@ mvn:org.opendaylight.jsonrpc.bus/bus-config/${project.version}/cfg/config odl-netty-4 - odl-mdsal-model-rfc6991 - odl-aaa-shiro + odl-ietf-model-rfc6991 + odl-aaa-shiro diff --git a/features/odl-jsonrpc-cluster/pom.xml b/features/odl-jsonrpc-cluster/pom.xml index 33708114..562d30ce 100644 --- a/features/odl-jsonrpc-cluster/pom.xml +++ b/features/odl-jsonrpc-cluster/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.1.3 + 14.1.6 diff --git a/features/odl-jsonrpc-cluster/src/main/feature/feature.xml b/features/odl-jsonrpc-cluster/src/main/feature/feature.xml index bff04ffb..0bfe8cd6 100644 --- a/features/odl-jsonrpc-cluster/src/main/feature/feature.xml +++ b/features/odl-jsonrpc-cluster/src/main/feature/feature.xml @@ -8,8 +8,8 @@ --> - odl-mdsal-binding-dom-adapter - odl-restconf-openapi + odl-mdsal-binding-dom-adapter + odl-restconf-openapi diff --git a/features/odl-jsonrpc-provider/pom.xml b/features/odl-jsonrpc-provider/pom.xml index e4c2639b..2732b277 100644 --- a/features/odl-jsonrpc-provider/pom.xml +++ b/features/odl-jsonrpc-provider/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.1.3 + 14.1.6 diff --git a/features/odl-jsonrpc-provider/src/main/feature/feature.xml b/features/odl-jsonrpc-provider/src/main/feature/feature.xml index faaf4526..e75bccd4 100644 --- a/features/odl-jsonrpc-provider/src/main/feature/feature.xml +++ b/features/odl-jsonrpc-provider/src/main/feature/feature.xml @@ -8,7 +8,7 @@ --> - odl-mdsal-binding-dom-adapter + odl-mdsal-binding-dom-adapter diff --git a/features/pom.xml b/features/pom.xml index 30681f8f..b4519d0a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.3 + 14.1.6 org.opendaylight.jsonrpc diff --git a/karaf/pom.xml b/karaf/pom.xml index 5918082b..00d6c45e 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 14.1.3 + 14.1.6 org.opendaylight.jsonrpc diff --git a/parent/pom.xml b/parent/pom.xml index df057bed..d539fe99 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 14.0.18 + 15.0.2 @@ -34,14 +34,14 @@ org.opendaylight.netconf netconf-artifacts - 9.0.1 + 10.0.1 pom import org.opendaylight.aaa aaa-artifacts - 0.21.2 + 0.22.2 pom import diff --git a/pom.xml b/pom.xml index bf0c193a..3795f64f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.1.3 + 14.1.6 org.opendaylight.jsonrpc diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index 041f275e..7f8cfade 100644 --- a/provider/cluster/pom.xml +++ b/provider/cluster/pom.xml @@ -25,7 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller bundle-parent - 11.0.2 + 12.0.2 pom import @@ -133,7 +133,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html provided - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-yang-types @@ -219,7 +219,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.apache.pekko - pekko-testkit_2.13 + pekko-testkit_3 test diff --git a/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/TestCustomizer.java b/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/TestCustomizer.java index 1558959e..952d450d 100644 --- a/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/TestCustomizer.java +++ b/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/TestCustomizer.java @@ -15,16 +15,24 @@ import org.opendaylight.mdsal.dom.broker.DOMMountPointServiceImpl; import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter; import org.opendaylight.mdsal.dom.broker.DOMRpcRouter; import org.opendaylight.mdsal.dom.broker.RouterDOMPublishNotificationService; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public class TestCustomizer extends AbstractConcurrentDataBrokerTest { private final DOMMountPointServiceImpl mountPointService = new DOMMountPointServiceImpl(); - private final DOMRpcRouter rpcRouter = new DOMRpcRouter(); private final DOMNotificationRouter notificationRouter = new DOMNotificationRouter(1); + private DOMRpcRouter rpcRouter; + public TestCustomizer() { super(true); } + @Override + protected void setupWithSchema(final EffectiveModelContext context) { + super.setupWithSchema(context); + rpcRouter = new DOMRpcRouter(getSchemaService()); + } + public DOMMountPointService getDOMMountPointService() { return mountPointService; } diff --git a/provider/common/pom.xml b/provider/common/pom.xml index aa20ca72..7dc9160c 100644 --- a/provider/common/pom.xml +++ b/provider/common/pom.xml @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal bnd-parent - 14.0.18 + 15.0.2 pom import diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataChangeListenerRegistration.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataChangeListenerRegistration.java index b1845db7..920df7aa 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataChangeListenerRegistration.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataChangeListenerRegistration.java @@ -61,7 +61,7 @@ public final class DataChangeListenerRegistration implements Registration, DOMDa Objects.requireNonNull(domDataBroker); Objects.requireNonNull(store); final var dtcs = domDataBroker.extension(DataTreeChangeExtension.class); - delegate = dtcs.registerDataTreeChangeListener(DOMDataTreeIdentifier.of(store, path), this); + delegate = dtcs.registerTreeChangeListener(DOMDataTreeIdentifier.of(store, path), this); } @SuppressWarnings("checkstyle:IllegalCatch") diff --git a/provider/pom.xml b/provider/pom.xml index 50f3f4db..34a6d116 100644 --- a/provider/pom.xml +++ b/provider/pom.xml @@ -186,7 +186,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html test - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-yang-types diff --git a/provider/single/pom.xml b/provider/single/pom.xml index 8a71ca13..0c24d0ac 100644 --- a/provider/single/pom.xml +++ b/provider/single/pom.xml @@ -154,7 +154,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html test - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-yang-types diff --git a/test-model/pom.xml b/test-model/pom.xml index b1e15caa..211147d1 100644 --- a/test-model/pom.xml +++ b/test-model/pom.xml @@ -28,11 +28,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html yang-common - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-yang-types - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-inet-types -- 2.34.1 From f1f0ffe2f9f4bf03377256dc3598ce511eb83c9b Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Fri, 14 Nov 2025 17:11:39 +0000 Subject: [PATCH 4/4] Release Validate --- api/pom.xml | 2 +- artifacts/pom.xml | 2 +- binding-adapter/pom.xml | 2 +- bus/api/pom.xml | 2 +- bus/config/pom.xml | 2 +- bus/examples/binding-bridge/pom.xml | 2 +- bus/examples/inband-models/pom.xml | 2 +- bus/examples/pom.xml | 2 +- bus/jsonrpc/pom.xml | 2 +- bus/messagelib/pom.xml | 2 +- bus/pom.xml | 2 +- bus/spi/pom.xml | 2 +- bus/transport-http/pom.xml | 2 +- bus/transport-zmq/pom.xml | 2 +- dom-codec/pom.xml | 2 +- features/features-jsonrpc/pom.xml | 2 +- features/odl-jsonrpc-all/pom.xml | 2 +- features/odl-jsonrpc-bus/pom.xml | 2 +- features/odl-jsonrpc-cluster/pom.xml | 2 +- features/odl-jsonrpc-provider/pom.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- provider/cluster/pom.xml | 2 +- provider/common/pom.xml | 2 +- provider/pom.xml | 2 +- provider/single/pom.xml | 2 +- security/aaa/pom.xml | 2 +- security/api/pom.xml | 2 +- security/noop/pom.xml | 2 +- security/pom.xml | 2 +- security/service/pom.xml | 2 +- test-model/pom.xml | 2 +- tools/parent/pom.xml | 2 +- tools/pom.xml | 2 +- tools/test-tool/pom.xml | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index cd177063..0d9cdfb6 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../parent jsonrpc-api diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 1d8213e1..e584251a 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-artifacts - 1.19.0-SNAPSHOT + 1.19.0 pom JSON-RPC :: Artifacts diff --git a/binding-adapter/pom.xml b/binding-adapter/pom.xml index 2038ee86..8a9c188d 100644 --- a/binding-adapter/pom.xml +++ b/binding-adapter/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../parent diff --git a/bus/api/pom.xml b/bus/api/pom.xml index a3e4f5c8..f6d15924 100644 --- a/bus/api/pom.xml +++ b/bus/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/config/pom.xml b/bus/config/pom.xml index 3ca55432..d87edbd7 100644 --- a/bus/config/pom.xml +++ b/bus/config/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.jsonrpc.bus bus-config - 1.19.0-SNAPSHOT + 1.19.0 JSON-RPC :: BUS :: Config Configuration files for JSONRPC bus jar diff --git a/bus/examples/binding-bridge/pom.xml b/bus/examples/binding-bridge/pom.xml index 22943b31..d8504ae7 100644 --- a/bus/examples/binding-bridge/pom.xml +++ b/bus/examples/binding-bridge/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/examples/inband-models/pom.xml b/bus/examples/inband-models/pom.xml index dd32694d..8f0a3074 100644 --- a/bus/examples/inband-models/pom.xml +++ b/bus/examples/inband-models/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../../parent inband-models diff --git a/bus/examples/pom.xml b/bus/examples/pom.xml index 3ef744fc..6553dcbe 100644 --- a/bus/examples/pom.xml +++ b/bus/examples/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-bus - 1.19.0-SNAPSHOT + 1.19.0 org.opendaylight.jsonrpc.bus examples diff --git a/bus/jsonrpc/pom.xml b/bus/jsonrpc/pom.xml index e52e59f3..099556c6 100644 --- a/bus/jsonrpc/pom.xml +++ b/bus/jsonrpc/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/messagelib/pom.xml b/bus/messagelib/pom.xml index 8fbb2583..da5069ab 100644 --- a/bus/messagelib/pom.xml +++ b/bus/messagelib/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/pom.xml b/bus/pom.xml index 3efcee76..9ac0edc9 100644 --- a/bus/pom.xml +++ b/bus/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.19.0-SNAPSHOT + 1.19.0 jsonrpc-bus pom diff --git a/bus/spi/pom.xml b/bus/spi/pom.xml index a696f50f..e3f30e6f 100644 --- a/bus/spi/pom.xml +++ b/bus/spi/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-http/pom.xml b/bus/transport-http/pom.xml index 58153df6..b0c5ab52 100644 --- a/bus/transport-http/pom.xml +++ b/bus/transport-http/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-zmq/pom.xml b/bus/transport-zmq/pom.xml index 39817653..529e97b4 100644 --- a/bus/transport-zmq/pom.xml +++ b/bus/transport-zmq/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/dom-codec/pom.xml b/dom-codec/pom.xml index 6ad8f23e..3225f898 100644 --- a/dom-codec/pom.xml +++ b/dom-codec/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../parent diff --git a/features/features-jsonrpc/pom.xml b/features/features-jsonrpc/pom.xml index 07569a33..0f6a8569 100644 --- a/features/features-jsonrpc/pom.xml +++ b/features/features-jsonrpc/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc features-jsonrpc - 1.19.0-SNAPSHOT + 1.19.0 feature JSON-RPC :: Features :: repository diff --git a/features/odl-jsonrpc-all/pom.xml b/features/odl-jsonrpc-all/pom.xml index 2a98c91c..a75dc90f 100644 --- a/features/odl-jsonrpc-all/pom.xml +++ b/features/odl-jsonrpc-all/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-all - 1.19.0-SNAPSHOT + 1.19.0 feature JSON-RPC :: Feature :: all diff --git a/features/odl-jsonrpc-bus/pom.xml b/features/odl-jsonrpc-bus/pom.xml index c4924a8d..1f595646 100644 --- a/features/odl-jsonrpc-bus/pom.xml +++ b/features/odl-jsonrpc-bus/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-bus - 1.19.0-SNAPSHOT + 1.19.0 feature JSON-RPC :: Feature :: bus diff --git a/features/odl-jsonrpc-cluster/pom.xml b/features/odl-jsonrpc-cluster/pom.xml index 562d30ce..a06125c5 100644 --- a/features/odl-jsonrpc-cluster/pom.xml +++ b/features/odl-jsonrpc-cluster/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-cluster - 1.19.0-SNAPSHOT + 1.19.0 feature JSON-RPC :: Feature :: Cluster diff --git a/features/odl-jsonrpc-provider/pom.xml b/features/odl-jsonrpc-provider/pom.xml index 2732b277..4e63ae4e 100644 --- a/features/odl-jsonrpc-provider/pom.xml +++ b/features/odl-jsonrpc-provider/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-provider - 1.19.0-SNAPSHOT + 1.19.0 feature JSON-RPC :: Feature :: provider diff --git a/features/pom.xml b/features/pom.xml index b4519d0a..014630de 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.jsonrpc features-aggregator - 1.19.0-SNAPSHOT + 1.19.0 pom JSON-RPC :: Features :: Aggregator diff --git a/karaf/pom.xml b/karaf/pom.xml index 00d6c45e..05bd1018 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-karaf - 1.19.0-SNAPSHOT + 1.19.0 JSON-RPC :: Karaf pom diff --git a/parent/pom.xml b/parent/pom.xml index d539fe99..60d2b6b8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 pom JSON-RPC :: Parent diff --git a/pom.xml b/pom.xml index 3795f64f..b4d7b637 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.19.0-SNAPSHOT + 1.19.0 pom JSON-RPC :: POM diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index 7f8cfade..0ed38ccf 100644 --- a/provider/cluster/pom.xml +++ b/provider/cluster/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-provider - 1.19.0-SNAPSHOT + 1.19.0 .. diff --git a/provider/common/pom.xml b/provider/common/pom.xml index 7dc9160c..90e7d72d 100644 --- a/provider/common/pom.xml +++ b/provider/common/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-provider - 1.19.0-SNAPSHOT + 1.19.0 .. diff --git a/provider/pom.xml b/provider/pom.xml index 34a6d116..1362e6d2 100644 --- a/provider/pom.xml +++ b/provider/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../parent diff --git a/provider/single/pom.xml b/provider/single/pom.xml index 0c24d0ac..46895272 100644 --- a/provider/single/pom.xml +++ b/provider/single/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-provider - 1.19.0-SNAPSHOT + 1.19.0 .. diff --git a/security/aaa/pom.xml b/security/aaa/pom.xml index b38c957b..67cbf571 100644 --- a/security/aaa/pom.xml +++ b/security/aaa/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/api/pom.xml b/security/api/pom.xml index 957fe433..53a4a7c6 100644 --- a/security/api/pom.xml +++ b/security/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/noop/pom.xml b/security/noop/pom.xml index 5cb540e4..2d150ab8 100644 --- a/security/noop/pom.xml +++ b/security/noop/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/pom.xml b/security/pom.xml index d6f7701a..45536228 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.19.0-SNAPSHOT + 1.19.0 jsonrpc-security pom diff --git a/security/service/pom.xml b/security/service/pom.xml index bbd3e7d7..00df1382 100644 --- a/security/service/pom.xml +++ b/security/service/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/test-model/pom.xml b/test-model/pom.xml index 211147d1..7fb220eb 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.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../parent jsonrpc-test-model diff --git a/tools/parent/pom.xml b/tools/parent/pom.xml index d0ba57ca..d0b3d4f8 100644 --- a/tools/parent/pom.xml +++ b/tools/parent/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.19.0-SNAPSHOT + 1.19.0 ../../parent tools-parent diff --git a/tools/pom.xml b/tools/pom.xml index 528bb95b..b4ff68a0 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.19.0-SNAPSHOT + 1.19.0 jsonrpc-tools pom diff --git a/tools/test-tool/pom.xml b/tools/test-tool/pom.xml index 4ec40d90..de91b61c 100644 --- a/tools/test-tool/pom.xml +++ b/tools/test-tool/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc tools-parent - 1.19.0-SNAPSHOT + 1.19.0 ../parent test-tool -- 2.34.1