From ed39523e497478906e39d34c60851791a624ca7d Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Wed, 31 Jul 2024 13:30:03 +0200 Subject: [PATCH 1/2] 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 Signed-off-by: Yaroslav Lastivka --- provider/cluster/pom.xml | 6 +++--- .../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, 49 insertions(+), 49 deletions(-) diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index 462ab525..396cb386 100644 --- a/provider/cluster/pom.xml +++ b/provider/cluster/pom.xml @@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller - + bundle-parent 10.0.2 pom @@ -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 1a88531e..59def405 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 94623b71..d9098c3f 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 17ff6087..5a2f7657 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 d7a550dd..a39eeacb 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 f52cc0f9..0abc6280 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 579ce1da8bad63b88847e20dacd263b605932db5 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Mon, 3 Feb 2025 13:56: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 | 2 +- pom.xml | 2 +- provider/cluster/pom.xml | 2 +- provider/common/pom.xml | 2 +- provider/pom.xml | 2 +- provider/single/pom.xml | 2 +- security/aaa/pom.xml | 2 +- security/api/pom.xml | 2 +- security/noop/pom.xml | 2 +- security/pom.xml | 2 +- security/service/pom.xml | 2 +- test-model/pom.xml | 2 +- tools/parent/pom.xml | 2 +- tools/pom.xml | 2 +- tools/test-tool/pom.xml | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index a8c64b9c..c9cc587b 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.18.0-SNAPSHOT + 1.18.0 ../parent jsonrpc-api diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 65e0d9b6..ff00d162 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.18.0-SNAPSHOT + 1.18.0 pom JSON-RPC :: Artifacts diff --git a/binding-adapter/pom.xml b/binding-adapter/pom.xml index b36b9ab0..583a6e16 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.18.0-SNAPSHOT + 1.18.0 ../parent diff --git a/bus/api/pom.xml b/bus/api/pom.xml index 91332c63..a648b62e 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.18.0-SNAPSHOT + 1.18.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/config/pom.xml b/bus/config/pom.xml index fea6d355..e89ee312 100644 --- a/bus/config/pom.xml +++ b/bus/config/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.jsonrpc.bus bus-config - 1.18.0-SNAPSHOT + 1.18.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 c966b617..6b174642 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.18.0-SNAPSHOT + 1.18.0 ../../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/examples/inband-models/pom.xml b/bus/examples/inband-models/pom.xml index 32b0b6e1..45380122 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.18.0-SNAPSHOT + 1.18.0 ../../../parent inband-models diff --git a/bus/examples/pom.xml b/bus/examples/pom.xml index 3ab4a32d..c20f8d26 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.18.0-SNAPSHOT + 1.18.0 org.opendaylight.jsonrpc.bus examples diff --git a/bus/jsonrpc/pom.xml b/bus/jsonrpc/pom.xml index b34da879..6ac257b1 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.18.0-SNAPSHOT + 1.18.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/messagelib/pom.xml b/bus/messagelib/pom.xml index 0c4719fb..af52eb90 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.18.0-SNAPSHOT + 1.18.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/pom.xml b/bus/pom.xml index e5450f17..f2410e06 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.18.0-SNAPSHOT + 1.18.0 jsonrpc-bus pom diff --git a/bus/spi/pom.xml b/bus/spi/pom.xml index 2a16a1bd..5669ea6d 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.18.0-SNAPSHOT + 1.18.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-http/pom.xml b/bus/transport-http/pom.xml index 84d1db68..9c16b9a8 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.18.0-SNAPSHOT + 1.18.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-zmq/pom.xml b/bus/transport-zmq/pom.xml index 9cedfd4c..f6731d6b 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.18.0-SNAPSHOT + 1.18.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/dom-codec/pom.xml b/dom-codec/pom.xml index 6a526e59..67be4255 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.18.0-SNAPSHOT + 1.18.0 ../parent diff --git a/features/features-jsonrpc/pom.xml b/features/features-jsonrpc/pom.xml index 0f57c34f..0e6acccb 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.18.0-SNAPSHOT + 1.18.0 feature JSON-RPC :: Features :: repository diff --git a/features/odl-jsonrpc-all/pom.xml b/features/odl-jsonrpc-all/pom.xml index 6df4daf5..a6c342e4 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.18.0-SNAPSHOT + 1.18.0 feature JSON-RPC :: Feature :: all diff --git a/features/odl-jsonrpc-bus/pom.xml b/features/odl-jsonrpc-bus/pom.xml index a622de16..bc380398 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.18.0-SNAPSHOT + 1.18.0 feature JSON-RPC :: Feature :: bus diff --git a/features/odl-jsonrpc-cluster/pom.xml b/features/odl-jsonrpc-cluster/pom.xml index eae34661..5a6cc050 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.18.0-SNAPSHOT + 1.18.0 feature JSON-RPC :: Feature :: Cluster diff --git a/features/odl-jsonrpc-provider/pom.xml b/features/odl-jsonrpc-provider/pom.xml index 15de559f..be595215 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.18.0-SNAPSHOT + 1.18.0 feature JSON-RPC :: Feature :: provider diff --git a/features/pom.xml b/features/pom.xml index 7a300401..61e9f1ad 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.jsonrpc features-aggregator - 1.18.0-SNAPSHOT + 1.18.0 pom JSON-RPC :: Features :: Aggregator diff --git a/karaf/pom.xml b/karaf/pom.xml index 72fc749b..0d5d0ff3 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.18.0-SNAPSHOT + 1.18.0 JSON-RPC :: Karaf pom diff --git a/parent/pom.xml b/parent/pom.xml index ad032610..9bea307c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opendaylight.jsonrpc jsonrpc-parent - 1.18.0-SNAPSHOT + 1.18.0 pom JSON-RPC :: Parent diff --git a/pom.xml b/pom.xml index 0e6562e8..db5b92fb 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.18.0-SNAPSHOT + 1.18.0 pom JSON-RPC :: POM diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index 396cb386..643a4a8d 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.18.0-SNAPSHOT + 1.18.0 .. diff --git a/provider/common/pom.xml b/provider/common/pom.xml index f6a89a21..53ed504c 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.18.0-SNAPSHOT + 1.18.0 .. diff --git a/provider/pom.xml b/provider/pom.xml index e0f0ed22..e4d415a0 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.18.0-SNAPSHOT + 1.18.0 ../parent diff --git a/provider/single/pom.xml b/provider/single/pom.xml index 6d3368fe..795c2799 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.18.0-SNAPSHOT + 1.18.0 .. diff --git a/security/aaa/pom.xml b/security/aaa/pom.xml index 6e89868b..b595c795 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.18.0-SNAPSHOT + 1.18.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/api/pom.xml b/security/api/pom.xml index 2b78d4e0..509a4ec0 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.18.0-SNAPSHOT + 1.18.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/noop/pom.xml b/security/noop/pom.xml index f92818a0..3644cad0 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.18.0-SNAPSHOT + 1.18.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/pom.xml b/security/pom.xml index a6969e88..c694ea60 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.18.0-SNAPSHOT + 1.18.0 jsonrpc-security pom diff --git a/security/service/pom.xml b/security/service/pom.xml index fbe24d4d..fe45e860 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.18.0-SNAPSHOT + 1.18.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/test-model/pom.xml b/test-model/pom.xml index f33bde7c..e6663630 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.18.0-SNAPSHOT + 1.18.0 ../parent jsonrpc-test-model diff --git a/tools/parent/pom.xml b/tools/parent/pom.xml index f4f1677b..1825005f 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.18.0-SNAPSHOT + 1.18.0 ../../parent tools-parent diff --git a/tools/pom.xml b/tools/pom.xml index 9808c6a3..b7af3a27 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.18.0-SNAPSHOT + 1.18.0 jsonrpc-tools pom diff --git a/tools/test-tool/pom.xml b/tools/test-tool/pom.xml index b6f13072..4d3ea41f 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.18.0-SNAPSHOT + 1.18.0 ../parent test-tool -- 2.43.0