From 1c1e2a50cf6ee52772b7d66d7aa901ec85279a4b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 13:26:58 +0200 Subject: [PATCH 1/5] Modernize exception assertions Use assertThrows() instead of Test(expected=), the latter has no equivalent in JUnit5. Change-Id: Ic547d5991e258aeff7a7f67209b49c6701ef3612 Signed-off-by: Robert Varga --- .../common/RemoteNotificationPublisherTest.java | 15 +++++++++------ .../provider/common/RemoteRpcInvokerTest.java | 11 +++++++---- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteNotificationPublisherTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteNotificationPublisherTest.java index ce707dc6..51cbe523 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteNotificationPublisherTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteNotificationPublisherTest.java @@ -7,6 +7,7 @@ */ package org.opendaylight.jsonrpc.provider.common; +import static org.junit.Assert.assertThrows; import static org.opendaylight.jsonrpc.provider.common.Util.findNode; import com.google.gson.JsonObject; @@ -84,13 +85,15 @@ public class RemoteNotificationPublisherTest extends AbstractJsonRpcTest { latch.await(10, TimeUnit.SECONDS); } - @Test(expected = IllegalArgumentException.class) - public void testNonExistingModule() throws InterruptedException { - ctrl.publishNotification("module-not-exists:notification1", new JsonObject()); + @Test + public void testNonExistingModule() { + assertThrows(IllegalArgumentException.class, + () -> ctrl.publishNotification("module-not-exists:notification1", new JsonObject())); } - @Test(expected = IllegalArgumentException.class) - public void testNonExistingNotification() throws InterruptedException { - ctrl.publishNotification("notification-not-exists", new JsonObject()); + @Test + public void testNonExistingNotification() { + assertThrows(IllegalArgumentException.class, + () -> ctrl.publishNotification("notification-not-exists", new JsonObject())); } } diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteRpcInvokerTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteRpcInvokerTest.java index 3430c76b..87da0f7b 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteRpcInvokerTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteRpcInvokerTest.java @@ -8,6 +8,7 @@ package org.opendaylight.jsonrpc.provider.common; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -81,13 +82,15 @@ public class RemoteRpcInvokerTest extends AbstractJsonRpcTest { assertNotNull(result); } - @Test(expected = IllegalArgumentException.class) + @Test public void testInvokeNonExistentMethod() { - ctrl.invokeRpc("test-model:method-not-exists", new JsonObject()); + assertThrows(IllegalArgumentException.class, + () -> ctrl.invokeRpc("test-model:method-not-exists", new JsonObject())); } - @Test(expected = IllegalArgumentException.class) + @Test public void testInvokeNonExistentPrefix() { - ctrl.invokeRpc("module-not-exists:simple-method", new JsonObject()); + assertThrows(IllegalArgumentException.class, + () -> ctrl.invokeRpc("module-not-exists:simple-method", new JsonObject())); } } -- 2.34.1 From 2a1b663adcf8556bf91180c13e496dfac2b17236 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 13:22:12 +0200 Subject: [PATCH 2/5] Switch to DataObjectIdentifier Reduce InstanceIdentifier proliferation by switching to DataObjectIdentifier. Change-Id: I513327802b7de05fd096dd1949778e583710b69e Signed-off-by: Robert Varga --- .../jsonrpc/provider/cluster/MountpointTest.java | 11 ++++++----- .../jsonrpc/provider/common/AbstractPeerContext.java | 10 +++++----- .../jsonrpc/provider/single/JsonRPCProvider.java | 5 +++-- .../jsonrpc/provider/single/JsonRPCProviderTest.java | 7 ++++--- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java b/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java index dc780f49..76e5406b 100644 --- a/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java +++ b/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java @@ -85,11 +85,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.data.rev201014 import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.FactorialInput; 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.network.topology.Topology; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.binding.Rpc; import org.opendaylight.yangtools.binding.meta.YangModuleInfo; import org.opendaylight.yangtools.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -100,11 +100,12 @@ import org.slf4j.LoggerFactory; public class MountpointTest { private static final Logger LOG = LoggerFactory.getLogger(MountpointTest.class); - private static final InstanceIdentifier MOCK_PEER_OP_ID = InstanceIdentifier.builder(Config.class) + private static final DataObjectIdentifier MOCK_PEER_OP_ID = + DataObjectIdentifier.builder(Config.class) .child(ActualEndpoints.class, new ActualEndpointsKey("device-1")) .build(); - private static final InstanceIdentifier MOCK_PEER_CFG_ID = InstanceIdentifier - .builder(Config.class) + private static final DataObjectIdentifier MOCK_PEER_CFG_ID = + DataObjectIdentifier.builder(Config.class) .child(ConfiguredEndpoints.class, new ConfiguredEndpointsKey("device-1")) .build(); private static final DataTreeIdentifier PEER_OP_DTI = DataTreeIdentifier @@ -279,7 +280,7 @@ public class MountpointTest { for (DataTreeModification dtm : changes) { LOG.info("Change to copy : {}", dtm); DataObjectModification rootNode = dtm.getRootNode(); - InstanceIdentifier path = dtm.getRootPath().path(); + DataObjectIdentifier path = dtm.path(); switch (rootNode.modificationType()) { case WRITE: case SUBTREE_MODIFIED: diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/AbstractPeerContext.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/AbstractPeerContext.java index 1b4dbf3c..126b7a41 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/AbstractPeerContext.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/AbstractPeerContext.java @@ -28,7 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Peer; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ActualEndpoints; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ActualEndpointsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ActualEndpointsKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,8 +57,8 @@ public abstract class AbstractPeerContext implements AutoCloseable { protected void removeOperationalState() { final WriteTransaction wrTrx = dataBroker.newWriteOnlyTransaction(); - final InstanceIdentifier peerOpId = InstanceIdentifier.builder(Config.class) - .child(ActualEndpoints.class, new ActualEndpointsKey(peer.getName())) + final DataObjectIdentifier peerOpId = DataObjectIdentifier.builder(Config.class) + .child(ActualEndpoints.class, new ActualEndpointsKey(peer.requireName())) .build(); wrTrx.delete(LogicalDatastoreType.OPERATIONAL, peerOpId); commitTransaction(wrTrx, peer.getName(), "Unpublish operational state"); @@ -92,8 +92,8 @@ public abstract class AbstractPeerContext implements AutoCloseable { protected void publishState(ActualEndpointsBuilder builder, MountStatus status, Optional cause, String managedBy) { - final InstanceIdentifier peerId = InstanceIdentifier.builder(Config.class) - .child(ActualEndpoints.class, new ActualEndpointsKey(peer.getName())) + final DataObjectIdentifier peerId = DataObjectIdentifier.builder(Config.class) + .child(ActualEndpoints.class, new ActualEndpointsKey(peer.requireName())) .build(); builder.setManagedBy(managedBy); builder.setMountStatus(status); diff --git a/provider/single/src/main/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProvider.java b/provider/single/src/main/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProvider.java index 15b069fe..961f9ce1 100644 --- a/provider/single/src/main/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProvider.java +++ b/provider/single/src/main/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProvider.java @@ -53,8 +53,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.ForceRelo import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.ForceReloadOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.ForceReloadOutputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Peer; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.xpath.api.YangXPathParserFactory; @@ -69,7 +69,8 @@ import org.slf4j.LoggerFactory; public final class JsonRPCProvider implements AutoCloseable { private static final String ME = "JSON RPC Provider"; private static final Logger LOG = LoggerFactory.getLogger(JsonRPCProvider.class); - private static final InstanceIdentifier GLOBAL_CFG_II = InstanceIdentifier.create(Config.class); + private static final DataObjectIdentifier GLOBAL_CFG_II = + DataObjectIdentifier.builder(Config.class).build(); private static final DataTreeIdentifier CFG_DTI = DataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, GLOBAL_CFG_II); private final Map peerState = new ConcurrentHashMap<>(); diff --git a/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java b/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java index 49b262c0..632f1354 100644 --- a/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java +++ b/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java @@ -54,8 +54,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.peer.Noti import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.peer.NotificationEndpointsKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.peer.RpcEndpointsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.peer.RpcEndpointsKey; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.binding.util.BindingMap; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.xpath.api.YangXPathParserFactory; /** @@ -65,7 +65,8 @@ import org.opendaylight.yangtools.yang.xpath.api.YangXPathParserFactory; */ public class JsonRPCProviderTest extends AbstractJsonRpcTest { private static final String DEMO1_MODEL = "demo1"; - private static final InstanceIdentifier GLOBAL_CFG_II = InstanceIdentifier.create(Config.class); + private static final DataObjectIdentifier GLOBAL_CFG_II = + DataObjectIdentifier.builder(Config.class).build(); private JsonRPCProvider provider; private static final RemoteGovernance GOVERNANCE_MOCK = new MockGovernance(); private int governancePort; @@ -254,7 +255,7 @@ public class JsonRPCProviderTest extends AbstractJsonRpcTest { try (ReadTransaction rtx = getDataBroker().newReadOnlyTransaction()) { return rtx .read(LogicalDatastoreType.OPERATIONAL, - InstanceIdentifier.builder(Config.class) + DataObjectIdentifier.builder(Config.class) .child(ActualEndpoints.class, new ActualEndpointsKey(name)) .build()) .get(); -- 2.34.1 From 5ba5d2e1e45a4d7df326f7037a7906dbf70fe33d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 13:28:25 +0200 Subject: [PATCH 3/5] Migrate DOM{Notification,Rpc}Router interactions Proxy methods have been deprecated, be explicit about adaptation. Change-Id: I3a4a038c1df8617d0831039d11c91fa800f6291e Signed-off-by: Robert Varga --- .../jsonrpc/provider/cluster/MountpointTest.java | 9 +++++---- .../jsonrpc/provider/cluster/TestCustomizer.java | 3 ++- .../jsonrpc/provider/common/RemoteControlTest.java | 5 ++++- .../common/RemoteNotificationPublisherTest.java | 11 +++++++---- .../jsonrpc/provider/common/RemoteRpcInvokerTest.java | 8 ++++++-- .../jsonrpc/provider/single/JsonRPCProviderTest.java | 5 ++++- 6 files changed, 28 insertions(+), 13 deletions(-) diff --git a/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java b/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java index 76e5406b..dddf3ad4 100644 --- a/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java +++ b/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java @@ -65,6 +65,7 @@ import org.opendaylight.mdsal.dom.api.DOMMountPoint; import org.opendaylight.mdsal.dom.api.DOMMountPointService; import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.mdsal.dom.api.DOMRpcService; +import org.opendaylight.mdsal.dom.broker.RouterDOMRpcService; import org.opendaylight.mdsal.eos.dom.simple.SimpleDOMEntityOwnershipService; import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider; import org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider; @@ -160,14 +161,14 @@ public class MountpointTest { final ClusterDependencies masterDeps = new ClusterDependencies(tf, masterTestCustomizer.getDataBroker(), masterTestCustomizer.getDOMMountPointService(), masterTestCustomizer.getDomBroker(), masterTestCustomizer.getSchemaService(), masterTestCustomizer.getDOMNotificationRouter(), - masterTestCustomizer.getDOMRpcRouter().rpcService(), yangXPathParserFactory, masterActorSystem, - clusterSingletonServiceProvider, governanceProvider, rpcProviderService, null); + new RouterDOMRpcService(masterTestCustomizer.getDOMRpcRouter()), yangXPathParserFactory, + masterActorSystem, clusterSingletonServiceProvider, governanceProvider, rpcProviderService, null); final ClusterDependencies slaveDeps = new ClusterDependencies(tf, slaveTestCustomizer.getDataBroker(), slaveTestCustomizer.getDOMMountPointService(), slaveTestCustomizer.getDomBroker(), slaveTestCustomizer.getSchemaService(), slaveTestCustomizer.getDOMNotificationRouter(), - slaveTestCustomizer.getDOMRpcRouter().rpcService(), yangXPathParserFactory, slaveActorSystem, - mockClusterSingletonServiceProvider, governanceProvider, rpcProviderService, null); + new RouterDOMRpcService(slaveTestCustomizer.getDOMRpcRouter()), yangXPathParserFactory, + slaveActorSystem, mockClusterSingletonServiceProvider, governanceProvider, rpcProviderService, null); masterConverter = new JsonRpcCodecFactory(masterTestCustomizer.getSchemaService().getGlobalContext()); JsonRpcDatastoreAdapter datastoreAdapter = new JsonRpcDatastoreAdapter(masterConverter, 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 cdc95814..1558959e 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 @@ -14,6 +14,7 @@ import org.opendaylight.mdsal.dom.api.DOMSchemaService; 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; public class TestCustomizer extends AbstractConcurrentDataBrokerTest { private final DOMMountPointServiceImpl mountPointService = new DOMMountPointServiceImpl(); @@ -33,7 +34,7 @@ public class TestCustomizer extends AbstractConcurrentDataBrokerTest { } public DOMNotificationPublishService getDOMNotificationRouter() { - return notificationRouter.notificationPublishService(); + return new RouterDOMPublishNotificationService(notificationRouter); } public DOMRpcRouter getDOMRpcRouter() { diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java index 7617f194..261837d5 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java @@ -46,6 +46,8 @@ import org.opendaylight.jsonrpc.model.TxArgument; import org.opendaylight.jsonrpc.model.TxOperationArgument; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; +import org.opendaylight.mdsal.dom.broker.RouterDOMPublishNotificationService; +import org.opendaylight.mdsal.dom.broker.RouterDOMRpcService; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.YangIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Config; @@ -85,7 +87,8 @@ public class RemoteControlTest extends AbstractJsonRpcTest { transportFactory = new DefaultTransportFactory(); codecFactory = new JsonRpcCodecFactory(schemaContext); ctrl = new RemoteControl(getDomBroker(), schemaContext, transportFactory, - getDOMNotificationRouter().notificationPublishService(), getDOMRpcRouter().rpcService(), codecFactory); + new RouterDOMPublishNotificationService(getDOMNotificationRouter()), + new RouterDOMRpcService(getDOMRpcRouter()), codecFactory); logTestName("START"); } diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteNotificationPublisherTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteNotificationPublisherTest.java index 51cbe523..868f0dae 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteNotificationPublisherTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteNotificationPublisherTest.java @@ -14,7 +14,6 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.eclipse.jdt.annotation.NonNull; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -23,6 +22,9 @@ import org.opendaylight.jsonrpc.impl.RemoteControl; import org.opendaylight.jsonrpc.model.RemoteNotificationPublisher; import org.opendaylight.mdsal.dom.api.DOMNotification; import org.opendaylight.mdsal.dom.api.DOMNotificationListener; +import org.opendaylight.mdsal.dom.broker.RouterDOMNotificationService; +import org.opendaylight.mdsal.dom.broker.RouterDOMPublishNotificationService; +import org.opendaylight.mdsal.dom.broker.RouterDOMRpcService; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; @@ -47,14 +49,15 @@ public class RemoteNotificationPublisherTest extends AbstractJsonRpcTest { public void setUp() { transportFactory = new DefaultTransportFactory(); ctrl = new RemoteControl(getDomBroker(), schemaContext, transportFactory, - getDOMNotificationRouter().notificationPublishService(), getDOMRpcRouter().rpcService(), codecFactory); + new RouterDOMPublishNotificationService(getDOMNotificationRouter()), + new RouterDOMRpcService(getDOMRpcRouter()), codecFactory); NotificationDefinition path = findNode(schemaContext, "test-model-notification:notification1", Module::getNotifications).orElseThrow(); latch = new CountDownLatch(1); - reg = getDOMNotificationRouter().notificationService() + reg = new RouterDOMNotificationService(getDOMNotificationRouter()) .registerNotificationListener(new DOMNotificationListener() { @Override - public void onNotification(@NonNull DOMNotification notification) { + public void onNotification(DOMNotification notification) { LOG.info("Got notification : {}", notification); latch.countDown(); } diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteRpcInvokerTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteRpcInvokerTest.java index 87da0f7b..09118d02 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteRpcInvokerTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteRpcInvokerTest.java @@ -26,6 +26,9 @@ import org.opendaylight.jsonrpc.test.TestRemoveCoffeePot; import org.opendaylight.jsonrpc.test.TestSimpleMethod; import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMRpcProviderServiceAdapter; import org.opendaylight.mdsal.binding.dom.adapter.ConstantAdapterContext; +import org.opendaylight.mdsal.dom.broker.RouterDOMPublishNotificationService; +import org.opendaylight.mdsal.dom.broker.RouterDOMRpcProviderService; +import org.opendaylight.mdsal.dom.broker.RouterDOMRpcService; import org.opendaylight.yangtools.binding.data.codec.impl.di.DefaultBindingDOMCodecFactory; import org.opendaylight.yangtools.concepts.Registration; @@ -46,7 +49,7 @@ public class RemoteRpcInvokerTest extends AbstractJsonRpcTest { final BindingDOMRpcProviderServiceAdapter rpcAdapter = new BindingDOMRpcProviderServiceAdapter( new ConstantAdapterContext(new DefaultBindingDOMCodecFactory().createBindingDOMCodec( getBindingRuntimeContext())), - getDOMRpcRouter().rpcProviderService()); + new RouterDOMRpcProviderService(getDOMRpcRouter())); rpcReg = rpcAdapter.registerRpcImplementations( new TestErrorMethod(), new TestFactorial(), @@ -57,7 +60,8 @@ public class RemoteRpcInvokerTest extends AbstractJsonRpcTest { codecFactory = new JsonRpcCodecFactory(schemaContext); transportFactory = new DefaultTransportFactory(); ctrl = new RemoteControl(getDomBroker(), schemaContext, transportFactory, - getDOMNotificationRouter().notificationPublishService(), getDOMRpcRouter().rpcService(), codecFactory); + new RouterDOMPublishNotificationService(getDOMNotificationRouter()), + new RouterDOMRpcService(getDOMRpcRouter()), codecFactory); logTestName("START"); } diff --git a/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java b/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java index 632f1354..fed46ab3 100644 --- a/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java +++ b/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java @@ -38,6 +38,8 @@ import org.opendaylight.jsonrpc.provider.common.ProviderDependencies; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.dom.broker.RouterDOMPublishNotificationService; +import org.opendaylight.mdsal.dom.broker.RouterDOMRpcService; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.YangIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Config; @@ -88,7 +90,8 @@ public class JsonRPCProviderTest extends AbstractJsonRpcTest { .build()); ProviderDependencies deps = new ProviderDependencies(new MockTransportFactory(tf), getDataBroker(), getDOMMountPointService(), getDomBroker(), getSchemaService(), - getDOMNotificationRouter().notificationPublishService(), getDOMRpcRouter().rpcService(), + new RouterDOMPublishNotificationService(getDOMNotificationRouter()), + new RouterDOMRpcService(getDOMRpcRouter()), ServiceLoader.load(YangXPathParserFactory.class).findFirst().orElseThrow()); provider = new JsonRPCProvider(deps, () -> Optional.of(GOVERNANCE_MOCK)); logTestName("START"); -- 2.34.1 From ac0cbd85ea14a35c70a79cc8a45b340ae85559d0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 13:11:15 +0200 Subject: [PATCH 4/5] WIP: Bump upstreams Adopt: - ietf-1.0.0 - mdsal-15.0.0 - controller-12.0.0 - aaa-0.22.0 - netconf-10.0.0-SNAPSHOT Change-Id: Ic7e5df3d32709e7ceb66ba15f0c8d0a9f9c92875 Signed-off-by: Robert Varga --- api/pom.xml | 4 ++-- binding-adapter/pom.xml | 2 +- bus/examples/binding-bridge/pom.xml | 4 ++-- features/odl-jsonrpc-all/src/main/feature/feature.xml | 2 +- features/odl-jsonrpc-bus/pom.xml | 4 ++-- features/odl-jsonrpc-bus/src/main/feature/feature.xml | 4 ++-- features/odl-jsonrpc-cluster/src/main/feature/feature.xml | 4 ++-- features/odl-jsonrpc-provider/src/main/feature/feature.xml | 2 +- parent/pom.xml | 6 +++--- provider/cluster/pom.xml | 6 +++--- provider/common/pom.xml | 2 +- .../jsonrpc/impl/DataChangeListenerRegistration.java | 2 +- provider/pom.xml | 2 +- provider/single/pom.xml | 2 +- test-model/pom.xml | 4 ++-- 15 files changed, 25 insertions(+), 25 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/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/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/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..b4e08a01 100644 --- a/features/odl-jsonrpc-bus/pom.xml +++ b/features/odl-jsonrpc-bus/pom.xml @@ -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/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/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/parent/pom.xml b/parent/pom.xml index df057bed..6ddb806c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 14.0.18 + 15.0.0 @@ -34,14 +34,14 @@ org.opendaylight.netconf netconf-artifacts - 9.0.1 + 10.0.0-SNAPSHOT pom import org.opendaylight.aaa aaa-artifacts - 0.21.2 + 0.22.0 pom import diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index 041f275e..ee38b9c4 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.0 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/common/pom.xml b/provider/common/pom.xml index aa20ca72..d583b653 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.0 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 4a0678817053c95b7de4f17e67b9c33724104098 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Mon, 29 Sep 2025 12:13:01 +0000 Subject: [PATCH 5/5] 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 | 4 ++-- 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, 38 insertions(+), 38 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 4d4bcd38..1b281c76 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 54df4886..ee73cc35 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 56147ab4..c2eb98bf 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 1e73068f..b5b97595 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 b4e08a01..56f9d6fd 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 33708114..13ba03cb 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 e4c2639b..22bcac1e 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 30681f8f..1dd0c236 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 5918082b..57963812 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 6ddb806c..22e36714 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 @@ -34,7 +34,7 @@ org.opendaylight.netconf netconf-artifacts - 10.0.0-SNAPSHOT + 10.0.0 pom import diff --git a/pom.xml b/pom.xml index bf0c193a..f66afcff 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 ee38b9c4..400080c2 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 d583b653..3d617f60 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