From d59b7b3d9f890887d9322daa042292af367cfcfa Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 17 Jul 2024 12:25:16 +0200 Subject: [PATCH 1/3] WIP: Bump upstreams for 2024.09 Scandium Adopt: - odlparent-14.0.2 - infrautils-7.0.2 - yangtools-14.0.2 - mdsal-14.0.1 - controller-10.0.1 - aaa-0.20.0-SNAPSHOT - netconf-8.0.0-SNAPSHOT Change-Id: I20786a9c508cf0f6b0d20c95f1947930a9a26ba2 Signed-off-by: Robert Varga --- api/pom.xml | 16 ++++++++-------- artifacts/pom.xml | 2 +- binding-adapter/pom.xml | 12 ++++++------ .../jsonrpc/binding/AbstractHandler.java | 2 +- .../binding/ControllerRpcInvocationAdapter.java | 6 +++--- .../binding/EmbeddedRpcInvocationAdapter.java | 10 +++++----- .../jsonrpc/binding/InboundHandler.java | 8 ++++---- .../jsonrpc/binding/MultiModelBuilder.java | 2 +- .../jsonrpc/binding/MultiRpcProxy.java | 2 +- .../jsonrpc/binding/OutboundHandler.java | 6 +++--- .../jsonrpc/binding/RpcInvocationAdapter.java | 6 +++--- .../binding/SchemaAwareTransportFactory.java | 2 +- .../jsonrpc/binding/SingleRpcProxy.java | 2 +- .../jsonrpc/binding/TestModelServiceTest.java | 4 ++-- bus/config/pom.xml | 2 +- bus/examples/binding-bridge/pom.xml | 4 ++-- .../jsonrpc/bus/bb/example/InsideController.java | 2 +- dom-codec/pom.xml | 12 ++++++------ .../jsonrpc/dom/codec/AbstractCodecTest.java | 4 ++-- features/features-jsonrpc/pom.xml | 2 +- features/odl-jsonrpc-all/pom.xml | 2 +- .../odl-jsonrpc-all/src/main/feature/feature.xml | 2 +- features/odl-jsonrpc-bus/pom.xml | 2 +- .../odl-jsonrpc-bus/src/main/feature/feature.xml | 6 +++--- features/odl-jsonrpc-cluster/pom.xml | 2 +- .../src/main/feature/feature.xml | 4 ++-- features/odl-jsonrpc-provider/pom.xml | 2 +- .../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 +++--- .../provider/cluster/impl/ClusterUtil.java | 2 +- .../jsonrpc/provider/cluster/MountpointTest.java | 8 ++++---- provider/common/pom.xml | 2 +- .../impl/AbstractInbandModelsService.java | 2 +- .../opendaylight/jsonrpc/model/MutablePeer.java | 2 +- .../provider/common/AbstractJsonRpcTest.java | 12 ++++++------ .../common/JsonRPCNotificationServiceTest.java | 2 +- .../jsonrpc/provider/common/JsonRPCTE2ETest.java | 2 +- .../jsonrpc/provider/common/JsonRPCTxTest.java | 6 +++--- .../provider/common/JsonRPCtoRPCBridgeTest.java | 4 ++-- .../provider/common/RemoteControlTest.java | 2 +- .../provider/common/RemoteRpcInvokerTest.java | 2 +- .../jsonrpc/provider/common/TestUtils.java | 6 +++--- provider/pom.xml | 8 ++++---- provider/single/pom.xml | 8 ++++---- .../provider/single/JsonRPCProviderTest.java | 2 +- test-model/pom.xml | 4 ++-- tools/test-tool/pom.xml | 4 ++-- .../jsonrpc/tool/test/GovernanceImpl.java | 4 ++-- 52 files changed, 114 insertions(+), 114 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 58ee7e52..e5ab92e5 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -20,20 +20,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html JSON-RPC :: API - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.yangtools - yang-common + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types org.opendaylight.mdsal.binding.model.ietf rfc6991-ietf-yang-types - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-inet-types + org.opendaylight.yangtools + binding-spec + + + org.opendaylight.yangtools + yang-common diff --git a/artifacts/pom.xml b/artifacts/pom.xml index a6cd268e..c48fce66 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.11 + 14.0.2 org.opendaylight.jsonrpc diff --git a/binding-adapter/pom.xml b/binding-adapter/pom.xml index 50a3fcda..adb2ad95 100644 --- a/binding-adapter/pom.xml +++ b/binding-adapter/pom.xml @@ -65,13 +65,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html provided - org.opendaylight.mdsal - mdsal-binding-dom-codec + org.opendaylight.yangtools + binding-data-codec-dynamic provided - org.opendaylight.mdsal - mdsal-binding-runtime-spi + org.opendaylight.yangtools + binding-runtime-spi provided @@ -80,8 +80,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html provided - org.opendaylight.mdsal - mdsal-binding-generator + org.opendaylight.yangtools + binding-generator provided diff --git a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/AbstractHandler.java b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/AbstractHandler.java index 00180565..446d188d 100644 --- a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/AbstractHandler.java +++ b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/AbstractHandler.java @@ -11,7 +11,7 @@ import com.google.common.reflect.AbstractInvocationHandler; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.util.Objects; -import org.opendaylight.yangtools.yang.binding.Rpc; +import org.opendaylight.yangtools.binding.Rpc; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; /** diff --git a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/ControllerRpcInvocationAdapter.java b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/ControllerRpcInvocationAdapter.java index 9d0cdaa0..8e036fa9 100644 --- a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/ControllerRpcInvocationAdapter.java +++ b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/ControllerRpcInvocationAdapter.java @@ -8,11 +8,11 @@ package org.opendaylight.jsonrpc.binding; import java.util.Objects; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; -import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext; import org.opendaylight.mdsal.dom.api.DOMSchemaService; +import org.opendaylight.yangtools.binding.Rpc; +import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; +import org.opendaylight.yangtools.binding.runtime.api.BindingRuntimeContext; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** diff --git a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/EmbeddedRpcInvocationAdapter.java b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/EmbeddedRpcInvocationAdapter.java index 1bc7b562..fcd7e4cb 100644 --- a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/EmbeddedRpcInvocationAdapter.java +++ b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/EmbeddedRpcInvocationAdapter.java @@ -9,14 +9,14 @@ package org.opendaylight.jsonrpc.binding; import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMRpcProviderServiceAdapter; import org.opendaylight.mdsal.binding.dom.adapter.ConstantAdapterContext; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; -import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext; -import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext; -import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.dom.broker.DOMRpcRouter; import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService; +import org.opendaylight.yangtools.binding.Rpc; +import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; +import org.opendaylight.yangtools.binding.data.codec.impl.BindingCodecContext; +import org.opendaylight.yangtools.binding.runtime.api.BindingRuntimeContext; +import org.opendaylight.yangtools.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** diff --git a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/InboundHandler.java b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/InboundHandler.java index 308f993b..448dbd41 100644 --- a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/InboundHandler.java +++ b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/InboundHandler.java @@ -21,10 +21,10 @@ import org.opendaylight.jsonrpc.bus.jsonrpc.JsonRpcReplyMessage.Builder; import org.opendaylight.jsonrpc.bus.jsonrpc.JsonRpcRequestMessage; import org.opendaylight.jsonrpc.bus.messagelib.RequestMessageHandler; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.ResponseErrorCode; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.Rpc; -import org.opendaylight.yangtools.yang.binding.RpcInput; -import org.opendaylight.yangtools.yang.binding.RpcOutput; +import org.opendaylight.yangtools.binding.DataObject; +import org.opendaylight.yangtools.binding.Rpc; +import org.opendaylight.yangtools.binding.RpcInput; +import org.opendaylight.yangtools.binding.RpcOutput; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; diff --git a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/MultiModelBuilder.java b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/MultiModelBuilder.java index cb4c38a1..29540daf 100644 --- a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/MultiModelBuilder.java +++ b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/MultiModelBuilder.java @@ -11,7 +11,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.collect.MutableClassToInstanceMap; -import org.opendaylight.yangtools.yang.binding.Rpc; +import org.opendaylight.yangtools.binding.Rpc; /** * Builder for convenient way to define multiple RpcService implementations. diff --git a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/MultiRpcProxy.java b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/MultiRpcProxy.java index 1bcdbc68..c8b2c781 100644 --- a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/MultiRpcProxy.java +++ b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/MultiRpcProxy.java @@ -12,7 +12,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.binding.Rpc; +import org.opendaylight.yangtools.binding.Rpc; /** * Proxy context for remote RPC service which implements multiple yang models. diff --git a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/OutboundHandler.java b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/OutboundHandler.java index c562eb54..065beefa 100644 --- a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/OutboundHandler.java +++ b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/OutboundHandler.java @@ -16,9 +16,9 @@ import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import org.opendaylight.jsonrpc.bus.jsonrpc.JsonRpcReplyMessage; import org.opendaylight.jsonrpc.bus.messagelib.RequesterSession; -import org.opendaylight.yangtools.yang.binding.DataContainer; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.Rpc; +import org.opendaylight.yangtools.binding.DataContainer; +import org.opendaylight.yangtools.binding.DataObject; +import org.opendaylight.yangtools.binding.Rpc; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; diff --git a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/RpcInvocationAdapter.java b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/RpcInvocationAdapter.java index 0ffaa90d..cadc2365 100644 --- a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/RpcInvocationAdapter.java +++ b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/RpcInvocationAdapter.java @@ -7,10 +7,10 @@ */ package org.opendaylight.jsonrpc.binding; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; -import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext; +import org.opendaylight.yangtools.binding.Rpc; +import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; +import org.opendaylight.yangtools.binding.runtime.api.BindingRuntimeContext; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public interface RpcInvocationAdapter { diff --git a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/SchemaAwareTransportFactory.java b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/SchemaAwareTransportFactory.java index 8c4efd16..b42bc1a6 100644 --- a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/SchemaAwareTransportFactory.java +++ b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/SchemaAwareTransportFactory.java @@ -25,8 +25,8 @@ import org.opendaylight.jsonrpc.bus.messagelib.ResponderSession; import org.opendaylight.jsonrpc.bus.messagelib.TransportFactory; import org.opendaylight.jsonrpc.bus.spi.EventLoopConfiguration; import org.opendaylight.jsonrpc.bus.spi.EventLoopGroupProvider; +import org.opendaylight.yangtools.binding.Rpc; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/SingleRpcProxy.java b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/SingleRpcProxy.java index a7c487aa..7036679c 100644 --- a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/SingleRpcProxy.java +++ b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/SingleRpcProxy.java @@ -9,8 +9,8 @@ package org.opendaylight.jsonrpc.binding; import java.util.function.Consumer; import org.opendaylight.jsonrpc.bus.messagelib.RequesterSession; +import org.opendaylight.yangtools.binding.Rpc; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.Rpc; /** * Context of proxy. Allows proper cleanup of created instance. diff --git a/binding-adapter/src/test/java/org/opendaylight/jsonrpc/binding/TestModelServiceTest.java b/binding-adapter/src/test/java/org/opendaylight/jsonrpc/binding/TestModelServiceTest.java index 2d5db34b..e9a1f22f 100644 --- a/binding-adapter/src/test/java/org/opendaylight/jsonrpc/binding/TestModelServiceTest.java +++ b/binding-adapter/src/test/java/org/opendaylight/jsonrpc/binding/TestModelServiceTest.java @@ -38,8 +38,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014. import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.RemoveCoffeePotInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.SimpleMethod; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.SimpleMethodInputBuilder; -import org.opendaylight.yangtools.yang.binding.Rpc; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; +import org.opendaylight.yangtools.binding.Rpc; +import org.opendaylight.yangtools.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.Uint16; diff --git a/bus/config/pom.xml b/bus/config/pom.xml index cd120d76..6b02fb46 100644 --- a/bus/config/pom.xml +++ b/bus/config/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.11 + 14.0.2 diff --git a/bus/examples/binding-bridge/pom.xml b/bus/examples/binding-bridge/pom.xml index dd7b4226..3e3ba917 100644 --- a/bus/examples/binding-bridge/pom.xml +++ b/bus/examples/binding-bridge/pom.xml @@ -95,8 +95,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bus-jsonrpc - org.opendaylight.mdsal - yang-binding + org.opendaylight.yangtools + binding-spec org.opendaylight.yangtools diff --git a/bus/examples/binding-bridge/src/main/java/org/opendaylight/jsonrpc/bus/bb/example/InsideController.java b/bus/examples/binding-bridge/src/main/java/org/opendaylight/jsonrpc/bus/bb/example/InsideController.java index a9b4d735..907e3d97 100644 --- a/bus/examples/binding-bridge/src/main/java/org/opendaylight/jsonrpc/bus/bb/example/InsideController.java +++ b/bus/examples/binding-bridge/src/main/java/org/opendaylight/jsonrpc/bus/bb/example/InsideController.java @@ -15,7 +15,6 @@ import org.opendaylight.jsonrpc.binding.SchemaAwareTransportFactory; import org.opendaylight.jsonrpc.binding.SingleRpcProxy; import org.opendaylight.jsonrpc.bus.messagelib.ResponderSession; import org.opendaylight.jsonrpc.bus.spi.EventLoopConfiguration; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.bb.example.rev180924.Method1; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.bb.example.rev180924.Method1Input; @@ -23,6 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.bb.example.rev18092 import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.bb.example.rev180924.Method1OutputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.SimpleMethod; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.SimpleMethodInputBuilder; +import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; diff --git a/dom-codec/pom.xml b/dom-codec/pom.xml index d77d1b47..27b75ace 100644 --- a/dom-codec/pom.xml +++ b/dom-codec/pom.xml @@ -66,13 +66,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html test - org.opendaylight.mdsal - mdsal-binding-dom-codec + org.opendaylight.yangtools + binding-data-codec-dynamic test - org.opendaylight.mdsal - mdsal-binding-runtime-spi + org.opendaylight.yangtools + binding-runtime-spi test @@ -86,8 +86,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html test - org.opendaylight.mdsal - mdsal-binding-generator + org.opendaylight.yangtools + binding-generator test diff --git a/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodecTest.java b/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodecTest.java index 884c4d03..2410a88b 100644 --- a/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodecTest.java +++ b/dom-codec/src/test/java/org/opendaylight/jsonrpc/dom/codec/AbstractCodecTest.java @@ -19,8 +19,8 @@ import java.util.Collection; import org.junit.Rule; import org.junit.rules.TestName; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTest; -import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext; -import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; +import org.opendaylight.yangtools.binding.data.codec.impl.BindingCodecContext; +import org.opendaylight.yangtools.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; diff --git a/features/features-jsonrpc/pom.xml b/features/features-jsonrpc/pom.xml index 2573edaf..b6c9dcbf 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.11 + 14.0.2 diff --git a/features/odl-jsonrpc-all/pom.xml b/features/odl-jsonrpc-all/pom.xml index caba4f69..01538511 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.11 + 14.0.2 diff --git a/features/odl-jsonrpc-all/src/main/feature/feature.xml b/features/odl-jsonrpc-all/src/main/feature/feature.xml index 4c44897f..47865ae9 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 0a399fe6..58077244 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.11 + 14.0.2 diff --git a/features/odl-jsonrpc-bus/src/main/feature/feature.xml b/features/odl-jsonrpc-bus/src/main/feature/feature.xml index 2e19da91..1f991da6 100644 --- a/features/odl-jsonrpc-bus/src/main/feature/feature.xml +++ b/features/odl-jsonrpc-bus/src/main/feature/feature.xml @@ -11,9 +11,9 @@ mvn:org.opendaylight.jsonrpc.bus/bus-config/${project.version}/cfg/config - odl-netty-4 - odl-mdsal-model-rfc6991 - odl-aaa-shiro + odl-netty-4 + odl-mdsal-model-rfc6991 + odl-aaa-shiro diff --git a/features/odl-jsonrpc-cluster/pom.xml b/features/odl-jsonrpc-cluster/pom.xml index 192b0c7c..fe46bf66 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.11 + 14.0.2 diff --git a/features/odl-jsonrpc-cluster/src/main/feature/feature.xml b/features/odl-jsonrpc-cluster/src/main/feature/feature.xml index 5be4e1a5..da1cdfb6 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 8e48378e..f5a4a34a 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.11 + 14.0.2 diff --git a/features/odl-jsonrpc-provider/src/main/feature/feature.xml b/features/odl-jsonrpc-provider/src/main/feature/feature.xml index 5162d5c1..faaf4526 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 e6566f72..ea11c74b 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.jsonrpc diff --git a/karaf/pom.xml b/karaf/pom.xml index 73b78d07..832991c5 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.11 + 14.0.2 org.opendaylight.jsonrpc diff --git a/parent/pom.xml b/parent/pom.xml index 17c23433..b025f8a2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 13.0.1 + 14.0.1 @@ -34,14 +34,14 @@ org.opendaylight.netconf netconf-artifacts - 7.0.4 + 8.0.0-SNAPSHOT pom import org.opendaylight.aaa aaa-artifacts - 0.19.3 + 0.20.0-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index b9c29cae..2ed637d8 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.11 + 14.0.2 org.opendaylight.jsonrpc diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index b54466ab..b2cbf59a 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.2 + 10.0.1 pom import @@ -74,8 +74,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html provided - org.opendaylight.mdsal - mdsal-binding-runtime-spi + org.opendaylight.yangtools + binding-runtime-spi provided diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java index 0f90dc02..1063daa8 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java @@ -18,8 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.Ac import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ActualEndpointsKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ConfiguredEndpoints; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ConfiguredEndpointsKey; +import org.opendaylight.yangtools.binding.KeyStep; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.KeyStep; import org.opendaylight.yangtools.yang.common.Uint16; import scala.concurrent.duration.Duration; import scala.concurrent.duration.FiniteDuration; 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 1ef7da09..26d00ab0 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 @@ -57,7 +57,6 @@ import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.mdsal.binding.api.WriteTransaction; -import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; @@ -86,10 +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.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.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; import org.opendaylight.yangtools.yang.model.api.Module; @@ -195,7 +195,7 @@ public class MountpointTest { private static TestCustomizer newDataBrokerTest() throws Exception { final TestCustomizer dataBrokerTest = new TestCustomizer() { @Override - protected Set getModuleInfos() throws Exception { + protected Set getModuleInfos() { return ImmutableSet.of( BindingRuntimeHelpers.getYangModuleInfo(NetworkTopology.class), BindingRuntimeHelpers.getYangModuleInfo(Topology.class), diff --git a/provider/common/pom.xml b/provider/common/pom.xml index e0e5a127..e9f3a8d0 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.1 + 14.0.1 pom import diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/AbstractInbandModelsService.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/AbstractInbandModelsService.java index 3b800ce4..6b7de996 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/AbstractInbandModelsService.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/AbstractInbandModelsService.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.ServiceLoader; import org.opendaylight.jsonrpc.model.InbandModelsService; import org.opendaylight.jsonrpc.model.Module; -import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider; +import org.opendaylight.yangtools.binding.meta.YangModelBindingProvider; /** * Convenient class meant to be extended by standalone applications running outside of controller. diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/model/MutablePeer.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/model/MutablePeer.java index cf6c6863..9497f06a 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/model/MutablePeer.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/model/MutablePeer.java @@ -22,7 +22,7 @@ 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.RpcEndpoints; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.peer.RpcEndpointsKey; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; +import org.opendaylight.yangtools.binding.util.BindingMap; public class MutablePeer implements Peer { private String name; diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java index 44a930bb..6a0ee951 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java @@ -21,10 +21,6 @@ import org.opendaylight.jsonrpc.dom.codec.JsonRpcCodecFactory; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTest; import org.opendaylight.mdsal.binding.dom.adapter.test.ConcurrentDataBrokerTestCustomizer; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; -import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext; -import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext; -import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMMountPointService; import org.opendaylight.mdsal.dom.api.DOMSchemaService; @@ -36,7 +32,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.data.rev201014 import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.notif.rev201014.Notification1; 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.yangtools.yang.binding.YangModuleInfo; +import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; +import org.opendaylight.yangtools.binding.data.codec.impl.BindingCodecContext; +import org.opendaylight.yangtools.binding.meta.YangModuleInfo; +import org.opendaylight.yangtools.binding.runtime.api.BindingRuntimeContext; +import org.opendaylight.yangtools.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.slf4j.Logger; @@ -76,7 +76,7 @@ public abstract class AbstractJsonRpcTest extends AbstractDataBrokerTest { } @Override - protected Set getModuleInfos() throws Exception { + protected Set getModuleInfos() { return Set.of( BindingRuntimeHelpers.getYangModuleInfo(Config.class), BindingRuntimeHelpers.getYangModuleInfo(NetworkTopology.class), 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 cae4aaa0..d2ccc71c 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 @@ -41,8 +41,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types. import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Peer; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ConfiguredEndpointsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.peer.NotificationEndpointsBuilder; +import org.opendaylight.yangtools.binding.util.BindingMap; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.Module; diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTE2ETest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTE2ETest.java index bcc1b50c..a38ee35b 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTE2ETest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTE2ETest.java @@ -39,7 +39,6 @@ import org.opendaylight.jsonrpc.impl.RemoteControl; import org.opendaylight.jsonrpc.model.MutablePeer; import org.opendaylight.jsonrpc.model.RemoteGovernance; import org.opendaylight.jsonrpc.model.RemoteOmShard; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer.NodeResult; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; @@ -48,6 +47,7 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService; import org.opendaylight.mdsal.dom.api.DOMRpcService; import org.opendaylight.mdsal.dom.api.DOMTransactionChain; +import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer.NodeResult; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTxTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTxTest.java index db83f63f..b845770d 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTxTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTxTest.java @@ -48,8 +48,6 @@ import org.opendaylight.jsonrpc.hmap.HierarchicalEnumMap; import org.opendaylight.jsonrpc.hmap.JsonPathCodec; import org.opendaylight.jsonrpc.impl.JsonRPCTx; import org.opendaylight.jsonrpc.model.RemoteOmShard; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer.NodeResult; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; @@ -63,8 +61,10 @@ 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.TopologyBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder; +import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; +import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer.NodeResult; +import org.opendaylight.yangtools.binding.util.BindingMap; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; 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 2b3bc816..adbf635e 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 @@ -48,8 +48,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014. import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.MultiplyListOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.MultiplyLlInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.MultiplyLlOutput; -import org.opendaylight.yangtools.yang.binding.DataContainer; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; +import org.opendaylight.yangtools.binding.DataContainer; +import org.opendaylight.yangtools.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.Uint16; 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 34037002..7617f194 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 @@ -44,7 +44,6 @@ import org.opendaylight.jsonrpc.model.RemoteOmShard; import org.opendaylight.jsonrpc.model.StoreOperationArgument; import org.opendaylight.jsonrpc.model.TxArgument; import org.opendaylight.jsonrpc.model.TxOperationArgument; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer.NodeResult; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; @@ -58,6 +57,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.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint; +import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer.NodeResult; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.OperationFailedException; import org.opendaylight.yangtools.yang.common.QName; 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 8eab97cc..0b523928 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 @@ -25,7 +25,7 @@ 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.binding.dom.codec.impl.BindingCodecContext; +import org.opendaylight.yangtools.binding.data.codec.impl.BindingCodecContext; import org.opendaylight.yangtools.concepts.Registration; /** diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/TestUtils.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/TestUtils.java index ae0c44c6..cb917f96 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/TestUtils.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/TestUtils.java @@ -10,8 +10,6 @@ package org.opendaylight.jsonrpc.provider.common; import com.google.common.base.Preconditions; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer.NodeResult; 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.NetworkTopologyBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; @@ -21,8 +19,10 @@ 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.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey; +import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; +import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer.NodeResult; +import org.opendaylight.yangtools.binding.util.BindingMap; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; /** * Utility class to reduce code duplication. diff --git a/provider/pom.xml b/provider/pom.xml index 78442f1b..a5a86487 100644 --- a/provider/pom.xml +++ b/provider/pom.xml @@ -93,8 +93,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html provided - org.opendaylight.mdsal - mdsal-binding-runtime-spi + org.opendaylight.yangtools + binding-runtime-spi provided @@ -103,8 +103,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html provided - org.opendaylight.mdsal - mdsal-binding-generator + org.opendaylight.yangtools + binding-generator provided diff --git a/provider/single/pom.xml b/provider/single/pom.xml index 0e54d2c2..7186a3d8 100644 --- a/provider/single/pom.xml +++ b/provider/single/pom.xml @@ -58,8 +58,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html provided - org.opendaylight.mdsal - mdsal-binding-runtime-spi + org.opendaylight.yangtools + binding-runtime-spi provided @@ -68,8 +68,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html provided - org.opendaylight.mdsal - mdsal-binding-generator + org.opendaylight.yangtools + binding-generator provided 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 377db997..49b262c0 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.util.BindingMap; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.xpath.api.YangXPathParserFactory; /** diff --git a/test-model/pom.xml b/test-model/pom.xml index 3f5e91e1..545d5649 100644 --- a/test-model/pom.xml +++ b/test-model/pom.xml @@ -20,8 +20,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html JSON-RPC :: Test model - org.opendaylight.mdsal - yang-binding + org.opendaylight.yangtools + binding-spec org.opendaylight.yangtools diff --git a/tools/test-tool/pom.xml b/tools/test-tool/pom.xml index 33eb16e7..5de9e096 100644 --- a/tools/test-tool/pom.xml +++ b/tools/test-tool/pom.xml @@ -27,8 +27,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html true - org.opendaylight.mdsal - mdsal-binding-runtime-spi + org.opendaylight.yangtools + binding-runtime-spi org.opendaylight.mdsal diff --git a/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/GovernanceImpl.java b/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/GovernanceImpl.java index ce77ec75..418938cb 100644 --- a/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/GovernanceImpl.java +++ b/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/GovernanceImpl.java @@ -34,8 +34,8 @@ import org.opendaylight.jsonrpc.bus.messagelib.TransportFactory; import org.opendaylight.jsonrpc.model.ModuleInfo; import org.opendaylight.jsonrpc.model.RemoteGovernance; import org.opendaylight.jsonrpc.model.StoreOperationArgument; -import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; -import org.opendaylight.yangtools.yang.binding.YangModuleInfo; +import org.opendaylight.yangtools.binding.meta.YangModuleInfo; +import org.opendaylight.yangtools.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.yangtools.yang.model.spi.source.FileYangTextSource; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangIRSourceInfoExtractor; import org.slf4j.Logger; -- 2.43.0 From 600eb2336286524f322f253f12daa913bc354c4d Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Wed, 31 Jul 2024 13:30:03 +0200 Subject: [PATCH 2/3] WIP: Migrate to Apache Pekko Adapt to change introduce in CONTROLLER-2120 and adapt jsonrpc to use Apache Pekko instead of akka. This includes: - changing dependencies - changing the imports - adapting configuration JIRA: JSONRPC-60 Change-Id: I8c29e0dc76553c3bf13482dc99203c544b90b494 Signed-off-by: Ivan Hrasko --- provider/cluster/pom.xml | 8 ++++---- .../provider/cluster/impl/ClusterDependencies.java | 2 +- .../cluster/impl/JsonRpcPeerListManager.java | 2 +- .../provider/cluster/impl/ProxyDOMDataBroker.java | 6 +++--- .../provider/cluster/impl/ProxyDOMRpcService.java | 10 +++++----- .../provider/cluster/impl/RemotePeerActor.java | 8 ++++---- .../provider/cluster/impl/RemotePeerContext.java | 10 +++++----- .../provider/cluster/impl/SlavePeerContext.java | 12 ++++++------ .../provider/cluster/messages/MountPointRequest.java | 2 +- .../cluster/messages/MountPointResponse.java | 2 +- .../provider/cluster/tx/ActorProxyTransaction.java | 8 ++++---- .../provider/cluster/tx/ProxyReadTransaction.java | 2 +- .../cluster/tx/ProxyReadWriteTransaction.java | 6 +++--- .../provider/cluster/tx/TransactionActor.java | 10 +++++----- .../jsonrpc/provider/cluster/MountpointTest.java | 4 ++-- provider/cluster/src/test/resources/application.conf | 8 ++++---- 16 files changed, 50 insertions(+), 50 deletions(-) diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index b2cbf59a..d8037f93 100644 --- a/provider/cluster/pom.xml +++ b/provider/cluster/pom.xml @@ -23,9 +23,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller - + bundle-parent - 10.0.1 + 10.0.1/version> pom import @@ -218,8 +218,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html test - com.typesafe.akka - akka-testkit_2.13 + org.apache.pekko + pekko-testkit_2.13 test diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterDependencies.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterDependencies.java index 13c1397d..9e09fc9d 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterDependencies.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterDependencies.java @@ -7,8 +7,8 @@ */ package org.opendaylight.jsonrpc.provider.cluster.impl; -import akka.actor.ActorSystem; import java.util.Objects; +import org.apache.pekko.actor.ActorSystem; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.jsonrpc.bus.messagelib.TransportFactory; 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 9b61686d..eb7bcc82 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 @@ -9,7 +9,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.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import java.util.HashMap; @@ -18,6 +17,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import org.apache.pekko.util.Timeout; import org.checkerframework.checker.lock.qual.GuardedBy; import org.checkerframework.checker.lock.qual.Holding; import org.eclipse.jdt.annotation.NonNull; diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMDataBroker.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMDataBroker.java index b0ddcdde..036b138f 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMDataBroker.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMDataBroker.java @@ -10,10 +10,10 @@ package org.opendaylight.jsonrpc.provider.cluster.impl; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.DEFAULT_ASK_TIMEOUT; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.durationFromUint16seconds; -import akka.actor.ActorRef; -import akka.pattern.Patterns; -import akka.util.Timeout; import java.util.concurrent.TimeUnit; +import org.apache.pekko.actor.ActorRef; +import org.apache.pekko.pattern.Patterns; +import org.apache.pekko.util.Timeout; import org.opendaylight.jsonrpc.provider.cluster.tx.ProxyReadTransaction; import org.opendaylight.jsonrpc.provider.cluster.tx.ProxyReadWriteTransaction; import org.opendaylight.jsonrpc.provider.cluster.tx.TxRequest; diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMRpcService.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMRpcService.java index 18408749..65e386f6 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMRpcService.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMRpcService.java @@ -7,20 +7,20 @@ */ package org.opendaylight.jsonrpc.provider.cluster.impl; -import static akka.pattern.Patterns.ask; +import static org.apache.pekko.pattern.Patterns.ask; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.DEFAULT_RPC_TIMEOUT; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.durationFromUint16seconds; -import akka.actor.ActorRef; -import akka.actor.ActorSystem; -import akka.dispatch.OnComplete; -import akka.util.Timeout; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import java.util.Collection; import java.util.concurrent.TimeUnit; +import org.apache.pekko.actor.ActorRef; +import org.apache.pekko.actor.ActorSystem; +import org.apache.pekko.dispatch.OnComplete; +import org.apache.pekko.util.Timeout; import org.opendaylight.jsonrpc.provider.cluster.messages.PathAndDataMsg; import org.opendaylight.jsonrpc.provider.cluster.rpc.EmptyRpcResponse; import org.opendaylight.jsonrpc.provider.cluster.rpc.InvokeRpcRequest; diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/RemotePeerActor.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/RemotePeerActor.java index cbec2234..b4c50d0c 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/RemotePeerActor.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/RemotePeerActor.java @@ -10,14 +10,14 @@ package org.opendaylight.jsonrpc.provider.cluster.impl; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.DEFAULT_WRITE_TX_TIMEOUT; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.durationFromUint16seconds; -import akka.actor.ActorRef; -import akka.actor.Props; -import akka.actor.Status.Failure; -import akka.actor.Status.Success; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; +import org.apache.pekko.actor.ActorRef; +import org.apache.pekko.actor.Props; +import org.apache.pekko.actor.Status.Failure; +import org.apache.pekko.actor.Status.Success; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor; import org.opendaylight.jsonrpc.provider.cluster.messages.InitCompleted; import org.opendaylight.jsonrpc.provider.cluster.messages.InitMasterMountPoint; diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/RemotePeerContext.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/RemotePeerContext.java index e2ff4af4..3ab7c8ea 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/RemotePeerContext.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/RemotePeerContext.java @@ -7,13 +7,9 @@ */ package org.opendaylight.jsonrpc.provider.cluster.impl; -import static akka.pattern.Patterns.ask; +import static org.apache.pekko.pattern.Patterns.ask; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.createMasterActorName; -import akka.actor.ActorRef; -import akka.cluster.Cluster; -import akka.dispatch.OnComplete; -import akka.util.Timeout; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.Uninterruptibles; import com.google.gson.JsonElement; @@ -21,6 +17,10 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; +import org.apache.pekko.actor.ActorRef; +import org.apache.pekko.cluster.Cluster; +import org.apache.pekko.dispatch.OnComplete; +import org.apache.pekko.util.Timeout; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.jsonrpc.dom.codec.JsonRpcCodecFactory; import org.opendaylight.jsonrpc.hmap.DataType; diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/SlavePeerContext.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/SlavePeerContext.java index ea6ce1b2..eaab804c 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/SlavePeerContext.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/SlavePeerContext.java @@ -7,21 +7,21 @@ */ package org.opendaylight.jsonrpc.provider.cluster.impl; -import static akka.pattern.Patterns.ask; +import static org.apache.pekko.pattern.Patterns.ask; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.DEFAULT_ASK_TIMEOUT; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.createActorPath; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.createMasterActorName; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.durationFromUint16seconds; import static org.opendaylight.jsonrpc.provider.cluster.impl.ClusterUtil.getPeerOpstateIdentifier; -import akka.actor.ActorRef; -import akka.actor.ActorSelection; -import akka.actor.PoisonPill; -import akka.dispatch.OnComplete; -import akka.util.Timeout; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.pekko.actor.ActorRef; +import org.apache.pekko.actor.ActorSelection; +import org.apache.pekko.actor.PoisonPill; +import org.apache.pekko.dispatch.OnComplete; +import org.apache.pekko.util.Timeout; import org.opendaylight.jsonrpc.provider.cluster.api.JsonRpcPeerSingletonService; import org.opendaylight.jsonrpc.provider.cluster.messages.MountPointRequest; import org.opendaylight.jsonrpc.provider.cluster.messages.UnregisterMountPoint; diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/MountPointRequest.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/MountPointRequest.java index a05b53f0..6d2dbf30 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/MountPointRequest.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/MountPointRequest.java @@ -7,8 +7,8 @@ */ package org.opendaylight.jsonrpc.provider.cluster.messages; -import akka.actor.ActorRef; import java.io.Serializable; +import org.apache.pekko.actor.ActorRef; /** * Sent by slave to initiate slave mountpoint creation. diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/MountPointResponse.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/MountPointResponse.java index cd06ce16..34f52606 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/MountPointResponse.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/MountPointResponse.java @@ -7,8 +7,8 @@ */ package org.opendaylight.jsonrpc.provider.cluster.messages; -import akka.actor.ActorRef; import java.io.Serializable; +import org.apache.pekko.actor.ActorRef; /** * Sent by master to slave in response to {@link MountPointRequest}. diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ActorProxyTransaction.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ActorProxyTransaction.java index 4a2c18a1..8775accb 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ActorProxyTransaction.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ActorProxyTransaction.java @@ -7,14 +7,14 @@ */ package org.opendaylight.jsonrpc.provider.cluster.tx; -import akka.actor.ActorRef; -import akka.dispatch.OnComplete; -import akka.pattern.Patterns; -import akka.util.Timeout; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.SettableFuture; import java.util.Objects; import java.util.Optional; +import org.apache.pekko.actor.ActorRef; +import org.apache.pekko.dispatch.OnComplete; +import org.apache.pekko.pattern.Patterns; +import org.apache.pekko.util.Timeout; import org.opendaylight.jsonrpc.provider.cluster.messages.PathAndDataMsg; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ProxyReadTransaction.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ProxyReadTransaction.java index e42a4ff4..48ebd1ce 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ProxyReadTransaction.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ProxyReadTransaction.java @@ -7,7 +7,7 @@ */ package org.opendaylight.jsonrpc.provider.cluster.tx; -import akka.util.Timeout; +import org.apache.pekko.util.Timeout; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Peer; import scala.concurrent.ExecutionContext; diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ProxyReadWriteTransaction.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ProxyReadWriteTransaction.java index 048a2468..2e96d438 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ProxyReadWriteTransaction.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ProxyReadWriteTransaction.java @@ -7,9 +7,6 @@ */ package org.opendaylight.jsonrpc.provider.cluster.tx; -import akka.actor.ActorRef; -import akka.dispatch.OnComplete; -import akka.util.Timeout; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.SettableFuture; @@ -19,6 +16,9 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; +import org.apache.pekko.actor.ActorRef; +import org.apache.pekko.dispatch.OnComplete; +import org.apache.pekko.util.Timeout; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction; diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/TransactionActor.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/TransactionActor.java index 1b9d43e5..3ac1fa87 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/TransactionActor.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/TransactionActor.java @@ -7,15 +7,15 @@ */ package org.opendaylight.jsonrpc.provider.cluster.tx; -import akka.actor.Props; -import akka.actor.ReceiveTimeout; -import akka.actor.Status.Failure; -import akka.actor.Status.Success; -import akka.actor.UntypedAbstractActor; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.MoreExecutors; import java.util.Optional; +import org.apache.pekko.actor.Props; +import org.apache.pekko.actor.ReceiveTimeout; +import org.apache.pekko.actor.Status.Failure; +import org.apache.pekko.actor.Status.Success; +import org.apache.pekko.actor.UntypedAbstractActor; import org.opendaylight.jsonrpc.provider.cluster.messages.PathAndDataMsg; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; 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 26d00ab0..dc780f49 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 @@ -19,8 +19,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; -import akka.actor.ActorSystem; -import akka.testkit.javadsl.TestKit; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.Futures; @@ -33,6 +31,8 @@ import java.util.Optional; import java.util.ServiceLoader; import java.util.Set; import java.util.concurrent.ExecutionException; +import org.apache.pekko.actor.ActorSystem; +import org.apache.pekko.testkit.javadsl.TestKit; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/provider/cluster/src/test/resources/application.conf b/provider/cluster/src/test/resources/application.conf index 22e1edbc..992532f3 100644 --- a/provider/cluster/src/test/resources/application.conf +++ b/provider/cluster/src/test/resources/application.conf @@ -1,7 +1,7 @@ Slave { - akka { + pekko { actor { - provider = "akka.cluster.ClusterActorRefProvider" + provider = "org.apache.pekko.cluster.ClusterActorRefProvider" warn-about-java-serializer-usage = false } remote { @@ -23,9 +23,9 @@ Slave { } Master { - akka { + pekko { actor { - provider = "akka.cluster.ClusterActorRefProvider" + provider = "org.apache.pekko.cluster.ClusterActorRefProvider" warn-about-java-serializer-usage = false } remote { -- 2.43.0 From 1c4c971165bdf3870d002e53d6269f3c5b5e6f3f Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Wed, 31 Jul 2024 11:46:01 +0000 Subject: [PATCH 3/3] 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 | 6 +++--- 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, 39 insertions(+), 39 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index e5ab92e5..21e88f28 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.17.0-SNAPSHOT + 1.17.0 ../parent jsonrpc-api diff --git a/artifacts/pom.xml b/artifacts/pom.xml index c48fce66..c0c66d77 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.17.0-SNAPSHOT + 1.17.0 pom JSON-RPC :: Artifacts diff --git a/binding-adapter/pom.xml b/binding-adapter/pom.xml index adb2ad95..8d3d3856 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.17.0-SNAPSHOT + 1.17.0 ../parent diff --git a/bus/api/pom.xml b/bus/api/pom.xml index 31aba130..d999c749 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.17.0-SNAPSHOT + 1.17.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/config/pom.xml b/bus/config/pom.xml index 6b02fb46..22b1a46e 100644 --- a/bus/config/pom.xml +++ b/bus/config/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.jsonrpc.bus bus-config - 1.17.0-SNAPSHOT + 1.17.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 3e3ba917..095a4b4d 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.17.0-SNAPSHOT + 1.17.0 ../../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/examples/inband-models/pom.xml b/bus/examples/inband-models/pom.xml index 08cb6c7d..901d2e75 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.17.0-SNAPSHOT + 1.17.0 ../../../parent inband-models diff --git a/bus/examples/pom.xml b/bus/examples/pom.xml index 71c370d5..73de0fae 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.17.0-SNAPSHOT + 1.17.0 org.opendaylight.jsonrpc.bus examples diff --git a/bus/jsonrpc/pom.xml b/bus/jsonrpc/pom.xml index 93ac7a74..6da9af1a 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.17.0-SNAPSHOT + 1.17.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/messagelib/pom.xml b/bus/messagelib/pom.xml index 91947460..3b92418c 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.17.0-SNAPSHOT + 1.17.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/pom.xml b/bus/pom.xml index c604eb15..054e6143 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.17.0-SNAPSHOT + 1.17.0 jsonrpc-bus pom diff --git a/bus/spi/pom.xml b/bus/spi/pom.xml index f283dbbd..cd750e9a 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.17.0-SNAPSHOT + 1.17.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-http/pom.xml b/bus/transport-http/pom.xml index 4268194b..4a5f0e94 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.17.0-SNAPSHOT + 1.17.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-zmq/pom.xml b/bus/transport-zmq/pom.xml index 4df4feb7..27798f4e 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.17.0-SNAPSHOT + 1.17.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/dom-codec/pom.xml b/dom-codec/pom.xml index 27b75ace..157bce74 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.17.0-SNAPSHOT + 1.17.0 ../parent diff --git a/features/features-jsonrpc/pom.xml b/features/features-jsonrpc/pom.xml index b6c9dcbf..4c7cc581 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.17.0-SNAPSHOT + 1.17.0 feature JSON-RPC :: Features :: repository diff --git a/features/odl-jsonrpc-all/pom.xml b/features/odl-jsonrpc-all/pom.xml index 01538511..adcb475e 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.17.0-SNAPSHOT + 1.17.0 feature JSON-RPC :: Feature :: all diff --git a/features/odl-jsonrpc-bus/pom.xml b/features/odl-jsonrpc-bus/pom.xml index 58077244..8521f5f8 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.17.0-SNAPSHOT + 1.17.0 feature JSON-RPC :: Feature :: bus diff --git a/features/odl-jsonrpc-cluster/pom.xml b/features/odl-jsonrpc-cluster/pom.xml index fe46bf66..cb13dea7 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.17.0-SNAPSHOT + 1.17.0 feature JSON-RPC :: Feature :: Cluster diff --git a/features/odl-jsonrpc-provider/pom.xml b/features/odl-jsonrpc-provider/pom.xml index f5a4a34a..e501350f 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.17.0-SNAPSHOT + 1.17.0 feature JSON-RPC :: Feature :: provider diff --git a/features/pom.xml b/features/pom.xml index ea11c74b..087e9ef1 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.jsonrpc features-aggregator - 1.17.0-SNAPSHOT + 1.17.0 pom JSON-RPC :: Features :: Aggregator diff --git a/karaf/pom.xml b/karaf/pom.xml index 832991c5..35a89677 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.17.0-SNAPSHOT + 1.17.0 JSON-RPC :: Karaf pom diff --git a/parent/pom.xml b/parent/pom.xml index b025f8a2..7a9eddc4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opendaylight.jsonrpc jsonrpc-parent - 1.17.0-SNAPSHOT + 1.17.0 pom JSON-RPC :: Parent @@ -34,14 +34,14 @@ org.opendaylight.netconf netconf-artifacts - 8.0.0-SNAPSHOT + 8.0.0 pom import org.opendaylight.aaa aaa-artifacts - 0.20.0-SNAPSHOT + 0.20.0 pom import diff --git a/pom.xml b/pom.xml index 2ed637d8..8be478d6 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.17.0-SNAPSHOT + 1.17.0 pom JSON-RPC :: POM diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index d8037f93..fd6ae22c 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.17.0-SNAPSHOT + 1.17.0 .. diff --git a/provider/common/pom.xml b/provider/common/pom.xml index e9f3a8d0..51a727e1 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.17.0-SNAPSHOT + 1.17.0 .. diff --git a/provider/pom.xml b/provider/pom.xml index a5a86487..f8466bd7 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.17.0-SNAPSHOT + 1.17.0 ../parent diff --git a/provider/single/pom.xml b/provider/single/pom.xml index 7186a3d8..933f6f7d 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.17.0-SNAPSHOT + 1.17.0 .. diff --git a/security/aaa/pom.xml b/security/aaa/pom.xml index fc3cf9ba..3a9691a0 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.17.0-SNAPSHOT + 1.17.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/api/pom.xml b/security/api/pom.xml index e5ce5d6d..8bc89dd2 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.17.0-SNAPSHOT + 1.17.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/noop/pom.xml b/security/noop/pom.xml index dc509a1c..c82ad688 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.17.0-SNAPSHOT + 1.17.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/pom.xml b/security/pom.xml index 40749157..6cb11244 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.17.0-SNAPSHOT + 1.17.0 jsonrpc-security pom diff --git a/security/service/pom.xml b/security/service/pom.xml index d4b822f4..8d364f5a 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.17.0-SNAPSHOT + 1.17.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/test-model/pom.xml b/test-model/pom.xml index 545d5649..c3a72b9f 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.17.0-SNAPSHOT + 1.17.0 ../parent jsonrpc-test-model diff --git a/tools/parent/pom.xml b/tools/parent/pom.xml index 79fd436d..e87fedeb 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.17.0-SNAPSHOT + 1.17.0 ../../parent tools-parent diff --git a/tools/pom.xml b/tools/pom.xml index f9ee43fc..f670cd85 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.17.0-SNAPSHOT + 1.17.0 jsonrpc-tools pom diff --git a/tools/test-tool/pom.xml b/tools/test-tool/pom.xml index 5de9e096..8f51b203 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.17.0-SNAPSHOT + 1.17.0 ../parent test-tool -- 2.43.0