From 271f82edb1bd3d0d8f9a262443ac06fa27482ecc Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 17 Mar 2024 22:11:42 +0100 Subject: [PATCH 1/2] WIP: Bump upstreams Adopt: - odlparent-13.0.11 - infrautils-6.0.6 - yangtools-13.0.2 - mdsal-13.0.1 - controller-9.0.1 - aaa-0.19.2 - netconf-7.0.2-SNAPSHOT Change-Id: Ic7add7ae502e633fea35b99193bf282bb15f1303 Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- bus/config/pom.xml | 2 +- .../jsonrpc/dom/codec/AbstractCodec.java | 7 +++---- 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 | 6 +++--- pom.xml | 2 +- provider/cluster/pom.xml | 2 +- .../cluster/impl/JsonRpcPeerListManager.java | 10 +++------- .../provider/cluster/MountpointTest.java | 3 ++- provider/common/pom.xml | 2 +- .../impl/JsonRPCNotificationService.java | 2 +- .../jsonrpc/impl/JsonRPCtoRPCBridge.java | 2 +- .../provider/common/InterfaceGenerator.java | 13 ++++++------ .../JsonRPCNotificationServiceTest.java | 3 +-- .../common/JsonRPCtoRPCBridgeTest.java | 2 +- .../provider/common/RemoteRpcInvokerTest.java | 20 ++++++------------- .../provider/single/JsonRPCProvider.java | 9 +++------ 23 files changed, 43 insertions(+), 58 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 4977a8a9..53b6990e 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 - 13.0.10 + 13.0.11 org.opendaylight.jsonrpc diff --git a/bus/config/pom.xml b/bus/config/pom.xml index 50149fb6..b390c0b1 100644 --- a/bus/config/pom.xml +++ b/bus/config/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.10 + 13.0.11 diff --git a/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodec.java b/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodec.java index 0ec49477..58a54040 100644 --- a/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodec.java +++ b/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodec.java @@ -53,10 +53,9 @@ abstract class AbstractCodec { * @throws IllegalStateException If module can't be found exception */ protected static Module getModule(EffectiveModelContext context, QNameModule nameModule) { - return context.findModule(nameModule) - .orElseThrow(() -> new IllegalStateException( - String.format("Could not find module for namespace %s and revision %s", - nameModule.getNamespace(), nameModule.getRevision()))); + return context.findModule(nameModule).orElseThrow( + () -> new IllegalStateException("Could not find module for namespace %s and revision %s".formatted( + nameModule.namespace(), nameModule.revision()))); } /** diff --git a/features/features-jsonrpc/pom.xml b/features/features-jsonrpc/pom.xml index 60daceb9..3fa9fc37 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 - 13.0.10 + 13.0.11 diff --git a/features/odl-jsonrpc-all/pom.xml b/features/odl-jsonrpc-all/pom.xml index 93aad58a..06355ee1 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 - 13.0.10 + 13.0.11 diff --git a/features/odl-jsonrpc-bus/pom.xml b/features/odl-jsonrpc-bus/pom.xml index 48a5ca5e..b9e9e9ef 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 - 13.0.10 + 13.0.11 diff --git a/features/odl-jsonrpc-cluster/pom.xml b/features/odl-jsonrpc-cluster/pom.xml index f49f9688..740d70ac 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 - 13.0.10 + 13.0.11 diff --git a/features/odl-jsonrpc-provider/pom.xml b/features/odl-jsonrpc-provider/pom.xml index b8d2c796..13b851f0 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 - 13.0.10 + 13.0.11 diff --git a/features/pom.xml b/features/pom.xml index be6df4be..2d10198a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.jsonrpc diff --git a/karaf/pom.xml b/karaf/pom.xml index bd5421c4..a39a2990 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 - 13.0.10 + 13.0.11 org.opendaylight.jsonrpc diff --git a/parent/pom.xml b/parent/pom.xml index 03aae759..0d768050 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 13.0.0 + 13.0.1 @@ -34,14 +34,14 @@ org.opendaylight.netconf netconf-artifacts - 7.0.1 + 7.0.2-SNAPSHOT pom import org.opendaylight.aaa aaa-artifacts - 0.19.1 + 0.19.2 pom import diff --git a/pom.xml b/pom.xml index b9020bc5..17bc38a5 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 - 13.0.10 + 13.0.11 org.opendaylight.jsonrpc diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index 3c807bfc..655913b3 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 - 9.0.0 + 9.0.1 pom import diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java index 4c6f0946..9b61686d 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java @@ -10,7 +10,6 @@ package org.opendaylight.jsonrpc.provider.cluster.impl; import static org.opendaylight.jsonrpc.provider.common.Util.removeFromMapAndClose; import akka.util.Timeout; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import java.util.HashMap; @@ -40,7 +39,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Peer; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ConfiguredEndpoints; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.slf4j.Logger; @@ -72,11 +70,9 @@ public final class JsonRpcPeerListManager implements DataTreeChangeListener>builder() - .put(ForceRefresh.class, JsonRpcPeerListManager::forceRefresh) - .put(ForceReload.class, this::forceReload) - .build()); + this.rpcReg = dependencies.getRpcProviderService().registerRpcImplementations( + (ForceRefresh) JsonRpcPeerListManager::forceRefresh, + (ForceReload) this::forceReload); } @Override 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 c35add7e..1ef7da09 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 @@ -88,6 +88,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -153,7 +154,7 @@ public class MountpointTest { .sendRequestAndReadReply(anyString(), any(), any(JsonObject.class)); doReturn(rpcClient).when(transportFactory) .createRequester(anyString(), any(ReplyMessageHandler.class), anyBoolean()); - doReturn(rpcReg).when(rpcProviderService).registerRpcImplementations(any()); + doReturn(rpcReg).when(rpcProviderService).registerRpcImplementations(any(Rpc[].class)); final ClusterDependencies masterDeps = new ClusterDependencies(tf, masterTestCustomizer.getDataBroker(), masterTestCustomizer.getDOMMountPointService(), masterTestCustomizer.getDomBroker(), diff --git a/provider/common/pom.xml b/provider/common/pom.xml index ccd215a7..f41d8223 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 - 13.0.0 + 13.0.1 pom import diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCNotificationService.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCNotificationService.java index 4f2f350e..91b8514b 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCNotificationService.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCNotificationService.java @@ -62,7 +62,7 @@ public final class JsonRPCNotificationService extends AbstractJsonRPCComponent for (final NotificationDefinition def : schemaContext.getNotifications()) { final QNameModule qm = def.getQName().getModule(); final String localName = def.getQName().getLocalName(); - final Optional possibleModule = schemaContext.findModule(qm.getNamespace(), qm.getRevision()); + final Optional possibleModule = schemaContext.findModule(qm); final JsonObject path = createRootPath(possibleModule.orElseThrow(), def.getQName()); final String endpoint = getEndpoint(DataType.NOTIFICATION, governance, path); if (endpoint != null) { diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCtoRPCBridge.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCtoRPCBridge.java index b9fc54f2..ddd54ff6 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCtoRPCBridge.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCtoRPCBridge.java @@ -81,7 +81,7 @@ public final class JsonRPCtoRPCBridge extends AbstractJsonRPCComponent implement ImmutableMap.Builder mapped) { final QNameModule qm = def.getQName().getModule(); final String localName = def.getQName().getLocalName(); - final Optional possibleModule = schemaContext.findModule(qm.getNamespace(), qm.getRevision()); + final Optional possibleModule = schemaContext.findModule(qm); final JsonObject path = createRootPath(possibleModule.orElseThrow(), def.getQName()); final String endpoint = getEndpoint(DataType.RPC, governance, path); if (endpoint != null) { diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/InterfaceGenerator.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/InterfaceGenerator.java index 4ff41879..af691da0 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/InterfaceGenerator.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/InterfaceGenerator.java @@ -7,13 +7,14 @@ */ package org.opendaylight.jsonrpc.provider.common; +import static java.util.Objects.requireNonNull; + import com.google.gson.JsonObject; import java.lang.reflect.Type; -import java.util.Objects; import net.bytebuddy.ByteBuddy; import net.bytebuddy.ClassFileVersion; +import net.bytebuddy.NamingStrategy.Suffixing.BaseNameResolver.ForFixedValue; import net.bytebuddy.NamingStrategy.SuffixingRandom; -import net.bytebuddy.NamingStrategy.SuffixingRandom.BaseNameResolver.ForFixedValue; import net.bytebuddy.description.annotation.AnnotationDescription; import net.bytebuddy.description.modifier.Visibility; import net.bytebuddy.dynamic.DynamicType.Builder; @@ -44,10 +45,10 @@ final class InterfaceGenerator { * @return generated proxy interface */ static Class generate(@NonNull RpcDefinition node) { - Objects.requireNonNull(node); - Builder builder = BB.makeInterface(AutoCloseable.class); - builder = generateMethod(node, builder); - return builder.make().load(InterfaceGenerator.class.getClassLoader()).getLoaded(); + return generateMethod(requireNonNull(node), BB.makeInterface(AutoCloseable.class)) + .make() + .load(InterfaceGenerator.class.getClassLoader()) + .getLoaded(); } private static Type getReturnType(RpcDefinition node) { diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCNotificationServiceTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCNotificationServiceTest.java index 411b4195..cae4aaa0 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCNotificationServiceTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCNotificationServiceTest.java @@ -153,7 +153,6 @@ public class JsonRPCNotificationServiceTest extends AbstractJsonRpcTest { } private static Absolute notificationPath(Module mod, String methodName) { - return Absolute.of(QName.create(mod.getQNameModule().getNamespace(), - mod.getQNameModule().getRevision(), methodName)); + return Absolute.of(QName.create(mod.getQNameModule(), methodName)); } } diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCtoRPCBridgeTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCtoRPCBridgeTest.java index e7498f1b..2b3bc816 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCtoRPCBridgeTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCtoRPCBridgeTest.java @@ -297,7 +297,7 @@ public class JsonRPCtoRPCBridgeTest extends AbstractJsonRpcTest { } private static QName constructRpcQname(Module mod, String methodName) { - return QName.create(mod.getQNameModule().getNamespace(), mod.getQNameModule().getRevision(), methodName); + return QName.create(mod.getQNameModule(), methodName); } private static QName rpcPath(Module mod, String methodName) { 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 7ae3b855..8eab97cc 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 @@ -9,7 +9,6 @@ package org.opendaylight.jsonrpc.provider.common; import static org.junit.Assert.assertNotNull; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import org.junit.After; @@ -27,13 +26,7 @@ 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.binding.dom.codec.impl.BindingCodecContext; -import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.ErrorMethod; -import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.Factorial; -import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.MultiplyList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.RemoveCoffeePot; -import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.SimpleMethod; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.Rpc; /** * Test for {@link RemoteRpcInvoker} part of {@link RemoteControl}. @@ -52,13 +45,12 @@ public class RemoteRpcInvokerTest extends AbstractJsonRpcTest { final BindingDOMRpcProviderServiceAdapter rpcAdapter = new BindingDOMRpcProviderServiceAdapter( new ConstantAdapterContext(new BindingCodecContext(getBindingRuntimeContext())), getDOMRpcRouter().rpcProviderService()); - rpcReg = rpcAdapter.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(ErrorMethod.class, new TestErrorMethod()) - .put(Factorial.class, new TestFactorial()) - .put(MultiplyList.class, new TestMultiplyList()) - .put(RemoveCoffeePot.class, new TestRemoveCoffeePot()) - .put(SimpleMethod.class, new TestSimpleMethod()) - .build()); + rpcReg = rpcAdapter.registerRpcImplementations( + new TestErrorMethod(), + new TestFactorial(), + new TestMultiplyList(), + new TestRemoveCoffeePot(), + new TestSimpleMethod()); testCustomizer.updateSchema(runtimeContext); codecFactory = new JsonRpcCodecFactory(schemaContext); transportFactory = new DefaultTransportFactory(); 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 735ea31d..15b069fe 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 @@ -9,7 +9,6 @@ package org.opendaylight.jsonrpc.provider.single; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import java.net.URISyntaxException; @@ -56,7 +55,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.ForceRelo import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Peer; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.xpath.api.YangXPathParserFactory; @@ -91,10 +89,9 @@ public final class JsonRPCProvider implements AutoCloseable { @Reference TransportFactory transportFactory, @Reference GovernanceProvider governance) { this(new ProviderDependencies(transportFactory, dataBroker, domMountPointService, domDataBroker, schemaService, domNotificationPublishService, domRpcService, yangXPathParserFactory), governance); - rpcReg = rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(ForceRefresh.class, this::forceRefresh) - .put(ForceReload.class, this::forceReload) - .build()); + rpcReg = rpcProviderService.registerRpcImplementations( + (ForceRefresh) this::forceRefresh, + (ForceReload) this::forceReload); } public JsonRPCProvider(ProviderDependencies dependencies, GovernanceProvider governance) { -- 2.43.0 From 0c83e7959745a37df7da355f3c30cb993a60dca7 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Sun, 17 Mar 2024 21:37:34 +0000 Subject: [PATCH 2/2] 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 df0bfef0..e56f7070 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.16.0-SNAPSHOT + 1.16.0 ../parent jsonrpc-api diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 53b6990e..2a7e5802 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.16.0-SNAPSHOT + 1.16.0 pom JSON-RPC :: Artifacts diff --git a/binding-adapter/pom.xml b/binding-adapter/pom.xml index f04a69ec..0d75ed58 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.16.0-SNAPSHOT + 1.16.0 ../parent diff --git a/bus/api/pom.xml b/bus/api/pom.xml index be437208..d9a6a4cf 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.16.0-SNAPSHOT + 1.16.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/config/pom.xml b/bus/config/pom.xml index b390c0b1..cab8ffe5 100644 --- a/bus/config/pom.xml +++ b/bus/config/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.jsonrpc.bus bus-config - 1.16.0-SNAPSHOT + 1.16.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 96a8d928..7c72110b 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.16.0-SNAPSHOT + 1.16.0 ../../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/examples/inband-models/pom.xml b/bus/examples/inband-models/pom.xml index 3c4ed02b..82deea50 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.16.0-SNAPSHOT + 1.16.0 ../../../parent inband-models diff --git a/bus/examples/pom.xml b/bus/examples/pom.xml index 3999505b..3d8ee1e1 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.16.0-SNAPSHOT + 1.16.0 org.opendaylight.jsonrpc.bus examples diff --git a/bus/jsonrpc/pom.xml b/bus/jsonrpc/pom.xml index f8674df3..670644af 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.16.0-SNAPSHOT + 1.16.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/messagelib/pom.xml b/bus/messagelib/pom.xml index 17a44af7..610dffc9 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.16.0-SNAPSHOT + 1.16.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/pom.xml b/bus/pom.xml index 1e453e91..f7c597cf 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.16.0-SNAPSHOT + 1.16.0 jsonrpc-bus pom diff --git a/bus/spi/pom.xml b/bus/spi/pom.xml index de3bfe7c..60a4842d 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.16.0-SNAPSHOT + 1.16.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-http/pom.xml b/bus/transport-http/pom.xml index 7d5cd28f..046a8594 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.16.0-SNAPSHOT + 1.16.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-zmq/pom.xml b/bus/transport-zmq/pom.xml index 7a97523f..51ec2860 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.16.0-SNAPSHOT + 1.16.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/dom-codec/pom.xml b/dom-codec/pom.xml index 8254d353..9d4944bf 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.16.0-SNAPSHOT + 1.16.0 ../parent diff --git a/features/features-jsonrpc/pom.xml b/features/features-jsonrpc/pom.xml index 3fa9fc37..50f603c9 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.16.0-SNAPSHOT + 1.16.0 feature JSON-RPC :: Features :: repository diff --git a/features/odl-jsonrpc-all/pom.xml b/features/odl-jsonrpc-all/pom.xml index 06355ee1..271dc586 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.16.0-SNAPSHOT + 1.16.0 feature JSON-RPC :: Feature :: all diff --git a/features/odl-jsonrpc-bus/pom.xml b/features/odl-jsonrpc-bus/pom.xml index b9e9e9ef..4604bea6 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.16.0-SNAPSHOT + 1.16.0 feature JSON-RPC :: Feature :: bus diff --git a/features/odl-jsonrpc-cluster/pom.xml b/features/odl-jsonrpc-cluster/pom.xml index 740d70ac..cec9b7e9 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.16.0-SNAPSHOT + 1.16.0 feature JSON-RPC :: Feature :: Cluster diff --git a/features/odl-jsonrpc-provider/pom.xml b/features/odl-jsonrpc-provider/pom.xml index 13b851f0..d94ffc72 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.16.0-SNAPSHOT + 1.16.0 feature JSON-RPC :: Feature :: provider diff --git a/features/pom.xml b/features/pom.xml index 2d10198a..b28bd228 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.jsonrpc features-aggregator - 1.16.0-SNAPSHOT + 1.16.0 pom JSON-RPC :: Features :: Aggregator diff --git a/karaf/pom.xml b/karaf/pom.xml index a39a2990..86bf0eda 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.16.0-SNAPSHOT + 1.16.0 JSON-RPC :: Karaf pom diff --git a/parent/pom.xml b/parent/pom.xml index 0d768050..c2ef0ec2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opendaylight.jsonrpc jsonrpc-parent - 1.16.0-SNAPSHOT + 1.16.0 pom JSON-RPC :: Parent @@ -34,7 +34,7 @@ org.opendaylight.netconf netconf-artifacts - 7.0.2-SNAPSHOT + 7.0.2 pom import diff --git a/pom.xml b/pom.xml index 17bc38a5..06ff1699 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.16.0-SNAPSHOT + 1.16.0 pom JSON-RPC :: POM diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index 655913b3..f4cfeddd 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.16.0-SNAPSHOT + 1.16.0 .. diff --git a/provider/common/pom.xml b/provider/common/pom.xml index f41d8223..7c3e408a 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.16.0-SNAPSHOT + 1.16.0 .. diff --git a/provider/pom.xml b/provider/pom.xml index 1145a8db..4d1931af 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.16.0-SNAPSHOT + 1.16.0 ../parent diff --git a/provider/single/pom.xml b/provider/single/pom.xml index 32a993ce..bdbb901d 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.16.0-SNAPSHOT + 1.16.0 .. diff --git a/security/aaa/pom.xml b/security/aaa/pom.xml index a3263b40..f2b94311 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.16.0-SNAPSHOT + 1.16.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/api/pom.xml b/security/api/pom.xml index cf62d18b..533b7496 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.16.0-SNAPSHOT + 1.16.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/noop/pom.xml b/security/noop/pom.xml index 0d2e4f5f..1fce7951 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.16.0-SNAPSHOT + 1.16.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/pom.xml b/security/pom.xml index 7116a79b..59356530 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.16.0-SNAPSHOT + 1.16.0 jsonrpc-security pom diff --git a/security/service/pom.xml b/security/service/pom.xml index a1b63771..ad85eb2a 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.16.0-SNAPSHOT + 1.16.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/test-model/pom.xml b/test-model/pom.xml index bb82fb18..2a16f6a3 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.16.0-SNAPSHOT + 1.16.0 ../parent jsonrpc-test-model diff --git a/tools/parent/pom.xml b/tools/parent/pom.xml index 0570aab0..902de271 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.16.0-SNAPSHOT + 1.16.0 ../../parent tools-parent diff --git a/tools/pom.xml b/tools/pom.xml index 370d5e50..b620a4a5 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.16.0-SNAPSHOT + 1.16.0 jsonrpc-tools pom diff --git a/tools/test-tool/pom.xml b/tools/test-tool/pom.xml index b0ee4934..7392b49a 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.16.0-SNAPSHOT + 1.16.0 ../parent test-tool -- 2.43.0