From 6fe20b0ebeb35210f2534c600ac0d0083a9c840f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 18:50:43 +0200 Subject: [PATCH 1/3] Remove use of InstanceIdentifier DataObject{Identifier,Reference} are modernized replacements for InstanceIdentifier, use them to interact with DataBroker. Change-Id: Iad222166257364cb9e635b58ebf7c8dfca8bfe64 Signed-off-by: Robert Varga --- .../impl/DataExportImportAppProvider.java | 20 ++++++++++-------- .../daexim/impl/ImportTaskTest.java | 21 ++++++++++--------- .../daexim/impl/LocalExportTaskTest.java | 4 ++-- .../daexim/impl/PerModuleExportTest.java | 8 +++---- .../daexim/impl/TestBackupData.java | 15 ++++++------- 5 files changed, 36 insertions(+), 32 deletions(-) diff --git a/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java b/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java index 2bd3886..a690f91 100644 --- a/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java +++ b/impl/src/main/java/org/opendaylight/daexim/impl/DataExportImportAppProvider.java @@ -46,7 +46,6 @@ import org.opendaylight.daexim.spi.NodeNameProvider; import org.opendaylight.infrautils.ready.SystemReadyMonitor; import org.opendaylight.infrautils.utils.concurrent.ThreadFactoryProvider; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.binding.api.RpcProviderService; @@ -94,9 +93,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.StatusImpo import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.status.export.output.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.status.export.output.NodesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.daexim.rev160921.status.export.output.NodesKey; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.binding.util.BindingMap; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -115,10 +114,11 @@ import org.slf4j.LoggerFactory; @RequireServiceComponentRuntime public final class DataExportImportAppProvider implements DataImportBootService, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(DataExportImportAppProvider.class); - private static final InstanceIdentifier TOP_IID = InstanceIdentifier.create(Daexim.class); - private static final InstanceIdentifier GLOBAL_STATUS_II = TOP_IID.child(DaeximStatus.class); - private static final InstanceIdentifier IPC_II = TOP_IID.child(DaeximControl.class); - private static final DataTreeIdentifier IPC_DTC = DataTreeIdentifier.of(OPERATIONAL, IPC_II); + private static final DataObjectIdentifier TOP_IID = DataObjectIdentifier.builder(Daexim.class).build(); + private static final DataObjectIdentifier GLOBAL_STATUS_II = + TOP_IID.toBuilder().child(DaeximStatus.class).build(); + private static final DataObjectIdentifier IPC_II = + TOP_IID.toBuilder().child(DaeximControl.class).build(); private final AtomicBoolean skipIpcDCN = new AtomicBoolean(false); private final DataBroker dataBroker; @@ -127,7 +127,7 @@ public final class DataExportImportAppProvider implements DataImportBootService, private final NodeNameProvider nodeNameProvider; private final ListeningScheduledExecutorService scheduledExecutorService; - private final InstanceIdentifier nodeStatusII; + private final DataObjectIdentifier nodeStatusII; private final Registration rpcReg; private final ComponentFactory factory; @@ -155,11 +155,13 @@ public final class DataExportImportAppProvider implements DataImportBootService, this.nodeNameProvider = requireNonNull(nodeNameProvider); this.factory = requireNonNull(factory); - nodeStatusII = GLOBAL_STATUS_II.child(NodeStatus.class, new NodeStatusKey(nodeNameProvider.getNodeName())); + nodeStatusII = GLOBAL_STATUS_II.toBuilder() + .child(NodeStatus.class, new NodeStatusKey(nodeNameProvider.getNodeName())) + .build(); if (readDaeximControl() != null) { skipIpcDCN.set(true); } - dataBroker.registerTreeChangeListener(IPC_DTC, this::ipcHandler); + dataBroker.registerTreeChangeListener(OPERATIONAL, IPC_II, this::ipcHandler); updateNodeStatus(); scheduledExecutorService = MoreExecutors.listeningDecorator(Executors.newScheduledThreadPool(10, ThreadFactoryProvider.builder().namePrefix("daexim-scheduler").logger(LOG).build().get())); diff --git a/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java b/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java index da9918e..e0ca74c 100644 --- a/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java +++ b/impl/src/test/java/org/opendaylight/daexim/impl/ImportTaskTest.java @@ -44,8 +44,8 @@ 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.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; import org.opendaylight.yangtools.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.binding.util.BindingMap; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -120,14 +120,14 @@ public class ImportTaskTest extends AbstractDataBrokerTest { return rt.call(); } - private void writeDataToRoot(InstanceIdentifier ii, D dataObject) + private void writeDataToRoot(DataObjectIdentifier ii, D dataObject) throws TransactionCommitFailedException, InterruptedException, ExecutionException { final WriteTransaction wrTrx = getDataBroker().newWriteOnlyTransaction(); wrTrx.put(LogicalDatastoreType.OPERATIONAL, ii, dataObject); wrTrx.commit().get(); } - private D readData(InstanceIdentifier ii) + private D readData(DataObjectIdentifier ii) throws InterruptedException, ExecutionException { try (ReadTransaction roTrx = getDataBroker().newReadOnlyTransaction()) { return roTrx.read(LogicalDatastoreType.OPERATIONAL, ii).get().orElseThrow(); @@ -135,10 +135,11 @@ public class ImportTaskTest extends AbstractDataBrokerTest { } private void verifyNetworkTopologyInDataStore() throws InterruptedException, ExecutionException { - final NetworkTopology nt = readData(InstanceIdentifier.create(NetworkTopology.class)); - assertNotNull(nt.getTopology()); - assertEquals(2, nt.getTopology().size()); - for (final Topology t : nt.nonnullTopology().values()) { + final NetworkTopology nt = readData(DataObjectIdentifier.builder(NetworkTopology.class).build()); + final var topologies = nt.getTopology(); + assertNotNull(topologies); + assertEquals(2, topologies.size()); + for (final Topology t : topologies.values()) { assertNotNull(t.getNode()); if (TestBackupData.TOPOLOGY_ID.equals(t.getTopologyId())) { assertEquals(2, t.getNode().size()); @@ -232,7 +233,7 @@ public class ImportTaskTest extends AbstractDataBrokerTest { // Remove data file first Files.delete(opDataFile); // Write arbitrary data to datastore - writeDataToRoot(InstanceIdentifier.create(NetworkTopology.class), new NetworkTopologyBuilder() + writeDataToRoot(DataObjectIdentifier.builder(NetworkTopology.class).build(), new NetworkTopologyBuilder() .setTopology(BindingMap.of(new TopologyBuilder().setTopologyId(TestBackupData.TOPOLOGY_ID).build())) .build()); // perform restore @@ -255,7 +256,7 @@ public class ImportTaskTest extends AbstractDataBrokerTest { // Remove data file first Files.delete(opDataFile); // Write arbitrary data to datastore - writeDataToRoot(InstanceIdentifier.create(NetworkTopology.class), new NetworkTopologyBuilder() + writeDataToRoot(DataObjectIdentifier.builder(NetworkTopology.class).build(), new NetworkTopologyBuilder() .setTopology(BindingMap.of(new TopologyBuilder().setTopologyId(TestBackupData.TOPOLOGY_ID).build())) .build()); // perform restore @@ -274,7 +275,7 @@ public class ImportTaskTest extends AbstractDataBrokerTest { @Test public void testClearScopeNone_OverWrote() throws Exception { // Write topology - writeDataToRoot(InstanceIdentifier.create(NetworkTopology.class), + writeDataToRoot(DataObjectIdentifier.builder(NetworkTopology.class).build(), new NetworkTopologyBuilder().setTopology(BindingMap.of(new TopologyBuilder() .setNode(BindingMap.of(new NodeBuilder().setNodeId(new NodeId(OLD_NODE_ID)).build())) .setTopologyId(TestBackupData.TOPOLOGY_ID).build())).build()); diff --git a/impl/src/test/java/org/opendaylight/daexim/impl/LocalExportTaskTest.java b/impl/src/test/java/org/opendaylight/daexim/impl/LocalExportTaskTest.java index 80a9d7f..5a7d7f4 100644 --- a/impl/src/test/java/org/opendaylight/daexim/impl/LocalExportTaskTest.java +++ b/impl/src/test/java/org/opendaylight/daexim/impl/LocalExportTaskTest.java @@ -43,8 +43,8 @@ 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.DataObjectIdentifier; import org.opendaylight.yangtools.binding.util.BindingMap; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,7 +83,7 @@ public class LocalExportTaskTest extends AbstractDataBrokerTest { when(schemaService.getGlobalContext()).thenReturn(modelContext()); final WriteTransaction wrTrx = getDataBroker().newWriteOnlyTransaction(); - final InstanceIdentifier ii = InstanceIdentifier.create(NetworkTopology.class); + final DataObjectIdentifier ii = DataObjectIdentifier.builder(NetworkTopology.class).build(); final NetworkTopology dObj = new NetworkTopologyBuilder() .setTopology(BindingMap.of(new TopologyBuilder() .setNode(BindingMap.of( diff --git a/impl/src/test/java/org/opendaylight/daexim/impl/PerModuleExportTest.java b/impl/src/test/java/org/opendaylight/daexim/impl/PerModuleExportTest.java index 4d7049b..62aaa85 100644 --- a/impl/src/test/java/org/opendaylight/daexim/impl/PerModuleExportTest.java +++ b/impl/src/test/java/org/opendaylight/daexim/impl/PerModuleExportTest.java @@ -33,8 +33,8 @@ 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.NetworkTopologyBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyBuilder; import org.opendaylight.yangtools.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.binding.util.BindingMap; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,10 +83,10 @@ public class PerModuleExportTest extends AbstractDataBrokerTest { @Test public void test() throws Exception { // 1, populate datastore - writeDataToRoot(InstanceIdentifier.create(NetworkTopology.class), new NetworkTopologyBuilder() + writeDataToRoot(DataObjectIdentifier.builder(NetworkTopology.class).build(), new NetworkTopologyBuilder() .setTopology(BindingMap.of(new TopologyBuilder().setTopologyId(TestBackupData.TOPOLOGY_ID).build())) .build()); - writeDataToRoot(InstanceIdentifier.create(Data2.class), new Data2Builder().setLeaf1("A").build()); + writeDataToRoot(DataObjectIdentifier.builder(Data2.class).build(), new Data2Builder().setLeaf1("A").build()); // 2, perform export ExportTask et = new ExportTask(null, null, true, true, getDomBroker(), schemaService, callback); et.call(); @@ -97,7 +97,7 @@ public class PerModuleExportTest extends AbstractDataBrokerTest { assertTrue(jsonFiles.length >= 3); } - private void writeDataToRoot(InstanceIdentifier ii, D dataObject) + private void writeDataToRoot(DataObjectIdentifier ii, D dataObject) throws InterruptedException, ExecutionException { final WriteTransaction wrTrx = getDataBroker().newWriteOnlyTransaction(); wrTrx.put(LogicalDatastoreType.OPERATIONAL, ii, dataObject); diff --git a/impl/src/test/java/org/opendaylight/daexim/impl/TestBackupData.java b/impl/src/test/java/org/opendaylight/daexim/impl/TestBackupData.java index a7f5eb6..69f43c1 100644 --- a/impl/src/test/java/org/opendaylight/daexim/impl/TestBackupData.java +++ b/impl/src/test/java/org/opendaylight/daexim/impl/TestBackupData.java @@ -7,23 +7,24 @@ */ package org.opendaylight.daexim.impl; +import org.eclipse.jdt.annotation.NonNull; 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.TopologyId; 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.TopologyKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; +import org.opendaylight.yangtools.binding.DataObjectIdentifier.WithKey; /** * Constants for src/test/resources/odl_backup_operational.json. */ public interface TestBackupData { - TopologyId TOPOLOGY_ID = new TopologyId("topo-id"); - TopologyId TOPOLOGY_ID_2 = new TopologyId("topo-id-2"); + @NonNull TopologyId TOPOLOGY_ID = new TopologyId("topo-id"); + @NonNull TopologyId TOPOLOGY_ID_2 = new TopologyId("topo-id-2"); - InstanceIdentifier TOPOLOGY_II = InstanceIdentifier - .create(NetworkTopology.class) - .child(Topology.class, - new TopologyKey(TestBackupData.TOPOLOGY_ID)); + @NonNull WithKey TOPOLOGY_II = DataObjectIdentifier.builder(NetworkTopology.class) + .child(Topology.class, new TopologyKey(TestBackupData.TOPOLOGY_ID)) + .build(); } -- 2.34.1 From 995c4b2692b14f26d2d1a64eacba93b04d803983 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 17:54:29 +0200 Subject: [PATCH 2/3] WIP: Bump upstreams Adopt: - ietf-1.0.0 - mdsal-15.0.0 - controller-12.0.0 - aaa-0.22.0 - netconf-10.0.0-SNAPSHOT Change-Id: I26289d13d6e2263e92b0cd39f2d1037ca5ee5f36 Signed-off-by: Robert Varga --- features/odl-daexim-all/pom.xml | 2 +- features/odl-daexim-all/src/main/feature/feature.xml | 2 +- features/odl-daexim/pom.xml | 8 ++++---- features/odl-daexim/src/main/feature/feature.xml | 6 +++--- impl/pom.xml | 2 +- model/pom.xml | 10 +++++----- parent/pom.xml | 4 ++-- test-model/pom.xml | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index 25bbb30..bf1eede 100644 --- a/features/odl-daexim-all/pom.xml +++ b/features/odl-daexim-all/pom.xml @@ -34,7 +34,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts pom - 9.0.1 + 10.0.0-SNAPSHOT import diff --git a/features/odl-daexim-all/src/main/feature/feature.xml b/features/odl-daexim-all/src/main/feature/feature.xml index 45b5d53..a25354e 100644 --- a/features/odl-daexim-all/src/main/feature/feature.xml +++ b/features/odl-daexim-all/src/main/feature/feature.xml @@ -9,6 +9,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - odl-restconf + odl-restconf diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index ff3c50b..401c891 100644 --- a/features/odl-daexim/pom.xml +++ b/features/odl-daexim/pom.xml @@ -34,14 +34,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.infrautils - odl-infrautils-ready + org.opendaylight.ietf + odl-ietf-model-rfc6991 xml features - org.opendaylight.mdsal.model - odl-mdsal-model-rfc6991 + org.opendaylight.infrautils + odl-infrautils-ready xml features diff --git a/features/odl-daexim/src/main/feature/feature.xml b/features/odl-daexim/src/main/feature/feature.xml index 20156a8..9a11fd8 100644 --- a/features/odl-daexim/src/main/feature/feature.xml +++ b/features/odl-daexim/src/main/feature/feature.xml @@ -12,10 +12,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html mvn:org.opendaylight.daexim/daexim-impl/${project.version}/cfg - odl-mdsal-binding - odl-mdsal-model-rfc6991 - odl-mdsal-broker + odl-ietf-model-rfc6991 odl-infrautils-ready odl-infrautils-utils + odl-mdsal-binding + odl-mdsal-broker diff --git a/impl/pom.xml b/impl/pom.xml index 22bc95a..0882af8 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -111,7 +111,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html mdsal-dom-api - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-yang-types diff --git a/model/pom.xml b/model/pom.xml index 4cb9513..6772ad6 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 14.0.18 + 15.0.0 org.opendaylight.daexim @@ -40,12 +40,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html guava - org.opendaylight.yangtools - yang-common + org.opendaylight.ietf.model + rfc6991-ietf-yang-types - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-yang-types + org.opendaylight.yangtools + yang-common diff --git a/parent/pom.xml b/parent/pom.xml index e831139..051fb66 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal bundle-parent - 14.0.18 + 15.0.0 org.opendaylight.daexim @@ -31,7 +31,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 11.0.2 + 12.0.0 pom import diff --git a/test-model/pom.xml b/test-model/pom.xml index 6690e9b..c2263a2 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.mdsal binding-parent - 14.0.18 + 15.0.0 org.opendaylight.daexim -- 2.34.1 From 6140f302d42afa2240ebcdd8b357d20e53f544f6 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Mon, 29 Sep 2025 16:57:03 +0000 Subject: [PATCH 3/3] Release Validate --- akka-infoprovider-impl/pom.xml | 2 +- artifacts/pom.xml | 2 +- features/daexim-features/pom.xml | 2 +- features/odl-daexim-all/pom.xml | 4 ++-- features/odl-daexim/pom.xml | 2 +- features/pom.xml | 2 +- impl/pom.xml | 2 +- karaf/pom.xml | 2 +- model/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- spi/pom.xml | 2 +- test-model/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/akka-infoprovider-impl/pom.xml b/akka-infoprovider-impl/pom.xml index 9bc5919..be98168 100644 --- a/akka-infoprovider-impl/pom.xml +++ b/akka-infoprovider-impl/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.18.0-SNAPSHOT + 1.18.0 ../parent daexim-akka-infoprovider-impl diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 5ee1036..780e082 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-artifacts - 1.18.0-SNAPSHOT + 1.18.0 pom diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml index 4d9b9fa..9225daa 100644 --- a/features/daexim-features/pom.xml +++ b/features/daexim-features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-features - 1.18.0-SNAPSHOT + 1.18.0 feature ODL :: daexim :: ${project.artifactId} diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index bf1eede..50ccac9 100644 --- a/features/odl-daexim-all/pom.xml +++ b/features/odl-daexim-all/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim odl-daexim-all - 1.18.0-SNAPSHOT + 1.18.0 feature OpenDaylight :: Daexim :: All @@ -34,7 +34,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts pom - 10.0.0-SNAPSHOT + 10.0.0 import diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index 401c891..e394a79 100644 --- a/features/odl-daexim/pom.xml +++ b/features/odl-daexim/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim odl-daexim - 1.18.0-SNAPSHOT + 1.18.0 feature OpenDaylight :: daexim (Karaf feature) diff --git a/features/pom.xml b/features/pom.xml index 2c930ac..8f6e439 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.daexim features-aggregator - 1.18.0-SNAPSHOT + 1.18.0 pom diff --git a/impl/pom.xml b/impl/pom.xml index 0882af8..65234fb 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.18.0-SNAPSHOT + 1.18.0 ../parent daexim-impl diff --git a/karaf/pom.xml b/karaf/pom.xml index 9ffc461..5329308 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-karaf - 1.18.0-SNAPSHOT + 1.18.0 pom ${project.artifactId} diff --git a/model/pom.xml b/model/pom.xml index 6772ad6..8b7efa5 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-model bundle - 1.18.0-SNAPSHOT + 1.18.0 diff --git a/parent/pom.xml b/parent/pom.xml index 051fb66..d6e9a58 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.18.0-SNAPSHOT + 1.18.0 pom diff --git a/pom.xml b/pom.xml index 3faa8d5..e2d80f2 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html pom org.opendaylight.daexim daexim - 1.18.0-SNAPSHOT + 1.18.0 test-model model diff --git a/spi/pom.xml b/spi/pom.xml index e20131d..53ee67a 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -18,5 +18,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-spi bundle - 1.18.0-SNAPSHOT + 1.18.0 diff --git a/test-model/pom.xml b/test-model/pom.xml index c2263a2..1a1f52e 100644 --- a/test-model/pom.xml +++ b/test-model/pom.xml @@ -18,5 +18,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-test-model bundle - 1.18.0-SNAPSHOT + 1.18.0 -- 2.34.1