From f3931bb418b69192f2a48cc60e690e9e94363ec5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 20 May 2024 10:38:45 +0200 Subject: [PATCH 1/3] Fix karaf packaging Explicitly set packaging to pom, as advised by upgraded m-i-p. Change-Id: If394890c1b2e0b8b316b2677aac9a5bcdf7a1f8e Signed-off-by: Robert Varga (cherry picked from commit b69b1df6f65a26fc64fe9e294b4e34c70c758394) --- karaf/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/karaf/pom.xml b/karaf/pom.xml index 1871775..38e3c00 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -19,6 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils serviceutils-karaf 0.14.0-SNAPSHOT + pom ODL :: serviceutils :: ${project.artifactId} -- 2.43.0 From 9b49966dd148d30df2a73650a94d28fa08d6de2f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 9 Jul 2024 01:41:23 +0200 Subject: [PATCH 2/3] WIP: Bump upstreams for 2024.09 Scandium Adopt: - odlparent-14.0.1 - infrautils-7.0.1 - yangtools-14.0.0 - mdsal-14.0.0-SNAPSHOT - controller-10.0.0-SNAPSHOT Also perform pom.xml cleanup, so that dependencies are alpha-sorted in the pom.xmls that needed to be updated. Change-Id: I59abe254d354edf6abdfd69a0cac161677cdf905 Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- commons/binding-parent/pom.xml | 4 +- commons/pom.xml | 2 +- commons/quality-parent/pom.xml | 8 ++-- .../src/main/feature/feature.xml | 4 +- features/odl-serviceutils-listener/pom.xml | 4 +- .../src/main/feature/feature.xml | 2 +- features/odl-serviceutils-metrics/pom.xml | 6 +-- .../src/main/feature/feature.xml | 6 +-- features/odl-serviceutils-rpc/pom.xml | 4 +- .../src/main/feature/feature.xml | 2 +- features/odl-serviceutils-srm/pom.xml | 2 +- features/odl-serviceutils-tools/pom.xml | 4 +- .../src/main/feature/feature.xml | 4 +- features/pom.xml | 2 +- features/serviceutils-features/pom.xml | 2 +- karaf/pom.xml | 2 +- metrics/it/pom.xml | 2 +- metrics/pom.xml | 2 +- pom.xml | 2 +- srm/api/pom.xml | 4 +- srm/impl/pom.xml | 43 +++++++++---------- srm/pom.xml | 2 +- srm/shell/pom.xml | 13 +++--- tools/api/pom.xml | 30 ++++++------- .../AbstractAsyncDataTreeChangeListener.java | 2 +- ...tClusteredAsyncDataTreeChangeListener.java | 2 +- ...ctClusteredSyncDataTreeChangeListener.java | 2 +- .../AbstractDataTreeChangeListener.java | 2 +- .../AbstractSyncDataTreeChangeListener.java | 2 +- .../ChainableDataTreeChangeListener.java | 2 +- .../ChainableDataTreeChangeListenerImpl.java | 2 +- .../DataTreeChangeListenerActions.java | 2 +- tools/listener-api/pom.xml | 20 ++++----- .../AbstractAsyncDataTreeChangeListener.java | 2 +- ...tClusteredAsyncDataTreeChangeListener.java | 2 +- ...ctClusteredSyncDataTreeChangeListener.java | 2 +- .../AbstractDataTreeChangeListener.java | 2 +- .../AbstractSyncDataTreeChangeListener.java | 2 +- .../ChainableDataTreeChangeListener.java | 2 +- .../ChainableDataTreeChangeListenerImpl.java | 2 +- .../DataTreeChangeListenerActions.java | 2 +- tools/pom.xml | 2 +- tools/testutils/pom.xml | 42 +++++++++--------- .../mdsal/testutils/TestFutureRpcResults.java | 2 +- upgrade/pom.xml | 20 ++++----- 46 files changed, 137 insertions(+), 139 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index a51261c..2ada827 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.1 diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml index 9cb147c..f84b560 100644 --- a/commons/binding-parent/pom.xml +++ b/commons/binding-parent/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.mdsal binding-parent - 13.0.1 + 14.0.0-SNAPSHOT @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.controller controller-artifacts - 9.0.2 + 10.0.0-SNAPSHOT pom import diff --git a/commons/pom.xml b/commons/pom.xml index c1a199d..f03907f 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.1 diff --git a/commons/quality-parent/pom.xml b/commons/quality-parent/pom.xml index 8f43cad..8991140 100644 --- a/commons/quality-parent/pom.xml +++ b/commons/quality-parent/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.infrautils parent - 6.0.6 + 7.0.1 @@ -29,21 +29,21 @@ org.opendaylight.yangtools yangtools-artifacts - 13.0.2 + 14.0.0 pom import org.opendaylight.mdsal mdsal-artifacts - 13.0.1 + 14.0.0-SNAPSHOT pom import org.opendaylight.controller controller-artifacts - 9.0.2 + 10.0.0-SNAPSHOT pom import diff --git a/features/odl-infrautils-metrics-prometheus/src/main/feature/feature.xml b/features/odl-infrautils-metrics-prometheus/src/main/feature/feature.xml index fef1b6e..b85664d 100644 --- a/features/odl-infrautils-metrics-prometheus/src/main/feature/feature.xml +++ b/features/odl-infrautils-metrics-prometheus/src/main/feature/feature.xml @@ -8,7 +8,7 @@ --> - odl-servlet-api - odl-karaf-feat-jetty + odl-servlet-api + odl-karaf-feat-jetty diff --git a/features/odl-serviceutils-listener/pom.xml b/features/odl-serviceutils-listener/pom.xml index 080ab7b..2347bc6 100644 --- a/features/odl-serviceutils-listener/pom.xml +++ b/features/odl-serviceutils-listener/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.11 + 14.0.1 @@ -20,7 +20,7 @@ org.opendaylight.mdsal mdsal-artifacts - 13.0.1 + 14.0.0-SNAPSHOT import pom diff --git a/features/odl-serviceutils-listener/src/main/feature/feature.xml b/features/odl-serviceutils-listener/src/main/feature/feature.xml index eacb801..de10cdf 100644 --- a/features/odl-serviceutils-listener/src/main/feature/feature.xml +++ b/features/odl-serviceutils-listener/src/main/feature/feature.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - odl-mdsal-binding-api + odl-mdsal-binding-api diff --git a/features/odl-serviceutils-metrics/pom.xml b/features/odl-serviceutils-metrics/pom.xml index 7cdbdfc..abbe730 100644 --- a/features/odl-serviceutils-metrics/pom.xml +++ b/features/odl-serviceutils-metrics/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.11 + 14.0.1 @@ -20,14 +20,14 @@ org.opendaylight.infrautils infrautils-artifacts - 6.0.6 + 7.0.1 import pom org.opendaylight.yangtools yangtools-artifacts - 13.0.2 + 14.0.0 import pom diff --git a/features/odl-serviceutils-metrics/src/main/feature/feature.xml b/features/odl-serviceutils-metrics/src/main/feature/feature.xml index 2f8f671..6b0692d 100644 --- a/features/odl-serviceutils-metrics/src/main/feature/feature.xml +++ b/features/odl-serviceutils-metrics/src/main/feature/feature.xml @@ -11,8 +11,8 @@ mvn:org.opendaylight.serviceutils/metrics-impl/${project.version}/cfg/config - odl-dropwizard-metrics - odl-infrautils-utils - odl-yangtools-util + odl-dropwizard-metrics + odl-infrautils-utils + odl-yangtools-util diff --git a/features/odl-serviceutils-rpc/pom.xml b/features/odl-serviceutils-rpc/pom.xml index 5e1febb..c8480d4 100644 --- a/features/odl-serviceutils-rpc/pom.xml +++ b/features/odl-serviceutils-rpc/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.11 + 14.0.1 @@ -27,7 +27,7 @@ org.opendaylight.yangtools yangtools-artifacts - 13.0.2 + 14.0.0 pom import diff --git a/features/odl-serviceutils-rpc/src/main/feature/feature.xml b/features/odl-serviceutils-rpc/src/main/feature/feature.xml index e06dac2..a99cfab 100644 --- a/features/odl-serviceutils-rpc/src/main/feature/feature.xml +++ b/features/odl-serviceutils-rpc/src/main/feature/feature.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - odl-yangtools-common + odl-yangtools-common diff --git a/features/odl-serviceutils-srm/pom.xml b/features/odl-serviceutils-srm/pom.xml index 169019a..ecbab1c 100644 --- a/features/odl-serviceutils-srm/pom.xml +++ b/features/odl-serviceutils-srm/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 13.0.11 + 14.0.1 diff --git a/features/odl-serviceutils-tools/pom.xml b/features/odl-serviceutils-tools/pom.xml index ec02d52..30509da 100644 --- a/features/odl-serviceutils-tools/pom.xml +++ b/features/odl-serviceutils-tools/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 13.0.11 + 14.0.1 @@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.controller controller-artifacts - 9.0.2 + 10.0.0-SNAPSHOT pom import diff --git a/features/odl-serviceutils-tools/src/main/feature/feature.xml b/features/odl-serviceutils-tools/src/main/feature/feature.xml index ef5fb42..83b759a 100644 --- a/features/odl-serviceutils-tools/src/main/feature/feature.xml +++ b/features/odl-serviceutils-tools/src/main/feature/feature.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - odl-controller-blueprint - odl-mdsal-broker + odl-controller-blueprint + odl-mdsal-broker diff --git a/features/pom.xml b/features/pom.xml index 2cd6bc6..c0cbe45 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.1 diff --git a/features/serviceutils-features/pom.xml b/features/serviceutils-features/pom.xml index b0d4165..8ca5528 100644 --- a/features/serviceutils-features/pom.xml +++ b/features/serviceutils-features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent feature-repo-parent - 13.0.11 + 14.0.1 diff --git a/karaf/pom.xml b/karaf/pom.xml index 38e3c00..86080a0 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent karaf4-parent - 13.0.11 + 14.0.1 diff --git a/metrics/it/pom.xml b/metrics/it/pom.xml index 79a4303..fd678c1 100644 --- a/metrics/it/pom.xml +++ b/metrics/it/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.infrautils itestutils-parent - 6.0.6 + 7.0.1 diff --git a/metrics/pom.xml b/metrics/pom.xml index 18c1010..2232dde 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.1 diff --git a/pom.xml b/pom.xml index 17ba7d7..8e89ca7 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.1 diff --git a/srm/api/pom.xml b/srm/api/pom.xml index 740b80b..41b0e35 100644 --- a/srm/api/pom.xml +++ b/srm/api/pom.xml @@ -24,8 +24,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.mdsal - yang-binding + org.opendaylight.yangtools + binding-spec org.opendaylight.yangtools diff --git a/srm/impl/pom.xml b/srm/impl/pom.xml index d59f957..a5149c4 100644 --- a/srm/impl/pom.xml +++ b/srm/impl/pom.xml @@ -25,23 +25,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - ${project.groupId} - srm-api - ${project.version} - - - ${project.groupId} - rpc-api - ${project.version} + com.google.guava + guava - ${project.groupId} - tools-api - ${project.version} + com.guicedee.services + javax.inject + true - com.google.guava - guava + jakarta.annotation + jakarta.annotation-api + true org.opendaylight.mdsal @@ -52,22 +47,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html mdsal-common-api - org.opendaylight.mdsal - yang-binding + org.opendaylight.serviceutils + rpc-api - org.opendaylight.yangtools - concepts + org.opendaylight.serviceutils + srm-api - com.guicedee.services - javax.inject - true + org.opendaylight.serviceutils + tools-api - jakarta.annotation - jakarta.annotation-api - true + org.opendaylight.yangtools + binding-spec + + + org.opendaylight.yangtools + concepts org.osgi diff --git a/srm/pom.xml b/srm/pom.xml index 72fb32f..154e104 100644 --- a/srm/pom.xml +++ b/srm/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.1 diff --git a/srm/shell/pom.xml b/srm/shell/pom.xml index 617da00..9fcc046 100644 --- a/srm/shell/pom.xml +++ b/srm/shell/pom.xml @@ -24,8 +24,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - com.google.guava - guava + com.google.guava + guava org.apache.karaf.shell @@ -44,16 +44,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-common-api - - org.opendaylight.mdsal - yang-binding - org.opendaylight.serviceutils srm-api + + org.opendaylight.yangtools + binding-spec + + diff --git a/tools/api/pom.xml b/tools/api/pom.xml index 2d8f9a5..666dee7 100644 --- a/tools/api/pom.xml +++ b/tools/api/pom.xml @@ -25,39 +25,39 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.eclipse.jdt - org.eclipse.jdt.annotation + com.guicedee.services + javax.inject + true - org.opendaylight.yangtools - concepts + jakarta.annotation + jakarta.annotation-api + provided + true - org.opendaylight.mdsal - yang-binding + org.eclipse.jdt + org.eclipse.jdt.annotation org.opendaylight.mdsal - mdsal-common-api + mdsal-binding-api org.opendaylight.mdsal - mdsal-binding-api + mdsal-common-api org.opendaylight.serviceutils metrics-api - com.guicedee.services - javax.inject - true + org.opendaylight.yangtools + binding-spec - jakarta.annotation - jakarta.annotation-api - provided - true + org.opendaylight.yangtools + concepts diff --git a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractAsyncDataTreeChangeListener.java b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractAsyncDataTreeChangeListener.java index 10f409b..ff0c01c 100644 --- a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractAsyncDataTreeChangeListener.java +++ b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractAsyncDataTreeChangeListener.java @@ -14,8 +14,8 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.metrics.MetricProvider; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractClusteredAsyncDataTreeChangeListener.java b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractClusteredAsyncDataTreeChangeListener.java index 6cd5335..6b214b3 100644 --- a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractClusteredAsyncDataTreeChangeListener.java +++ b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractClusteredAsyncDataTreeChangeListener.java @@ -15,7 +15,7 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.metrics.MetricProvider; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractClusteredSyncDataTreeChangeListener.java b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractClusteredSyncDataTreeChangeListener.java index 177c14c..38352eb 100644 --- a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractClusteredSyncDataTreeChangeListener.java +++ b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractClusteredSyncDataTreeChangeListener.java @@ -14,7 +14,7 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.metrics.MetricProvider; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractDataTreeChangeListener.java b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractDataTreeChangeListener.java index b7d88ab..6db10c2 100644 --- a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractDataTreeChangeListener.java +++ b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractDataTreeChangeListener.java @@ -14,8 +14,8 @@ import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.metrics.MetricProvider; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractSyncDataTreeChangeListener.java b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractSyncDataTreeChangeListener.java index 1b7de4d..a445345 100644 --- a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractSyncDataTreeChangeListener.java +++ b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/AbstractSyncDataTreeChangeListener.java @@ -13,7 +13,7 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.metrics.MetricProvider; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/ChainableDataTreeChangeListener.java b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/ChainableDataTreeChangeListener.java index db7d7d7..54f394c 100644 --- a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/ChainableDataTreeChangeListener.java +++ b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/ChainableDataTreeChangeListener.java @@ -8,7 +8,7 @@ package org.opendaylight.serviceutils.tools.mdsal.listener; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; /** * {@link DataTreeChangeListener} which can notify another DataTreeChangeListener. diff --git a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/ChainableDataTreeChangeListenerImpl.java b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/ChainableDataTreeChangeListenerImpl.java index d81ed23..cbf7029 100644 --- a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/ChainableDataTreeChangeListenerImpl.java +++ b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/ChainableDataTreeChangeListenerImpl.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataTreeModification; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/DataTreeChangeListenerActions.java b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/DataTreeChangeListenerActions.java index 192923b..9afdf77 100644 --- a/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/DataTreeChangeListenerActions.java +++ b/tools/api/src/main/java/org/opendaylight/serviceutils/tools/mdsal/listener/DataTreeChangeListenerActions.java @@ -11,7 +11,7 @@ import java.util.List; import javax.inject.Singleton; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.api.DataTreeModification; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/listener-api/pom.xml b/tools/listener-api/pom.xml index 1088092..494178a 100644 --- a/tools/listener-api/pom.xml +++ b/tools/listener-api/pom.xml @@ -27,24 +27,24 @@ true - org.opendaylight.serviceutils - metrics-api - - - org.opendaylight.yangtools - concepts + org.opendaylight.mdsal + mdsal-binding-api org.opendaylight.mdsal mdsal-common-api - org.opendaylight.mdsal - mdsal-binding-api + org.opendaylight.serviceutils + metrics-api - org.opendaylight.mdsal - yang-binding + org.opendaylight.yangtools + binding-spec + + + org.opendaylight.yangtools + concepts diff --git a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractAsyncDataTreeChangeListener.java b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractAsyncDataTreeChangeListener.java index 3b73edb..dea3af8 100644 --- a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractAsyncDataTreeChangeListener.java +++ b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractAsyncDataTreeChangeListener.java @@ -14,8 +14,8 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.metrics.MetricProvider; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractClusteredAsyncDataTreeChangeListener.java b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractClusteredAsyncDataTreeChangeListener.java index 2b805be..d3a2958 100644 --- a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractClusteredAsyncDataTreeChangeListener.java +++ b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractClusteredAsyncDataTreeChangeListener.java @@ -15,7 +15,7 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.metrics.MetricProvider; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractClusteredSyncDataTreeChangeListener.java b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractClusteredSyncDataTreeChangeListener.java index b0c6947..8833ea8 100644 --- a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractClusteredSyncDataTreeChangeListener.java +++ b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractClusteredSyncDataTreeChangeListener.java @@ -14,7 +14,7 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.metrics.MetricProvider; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractDataTreeChangeListener.java b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractDataTreeChangeListener.java index 0725fb1..7b560fa 100644 --- a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractDataTreeChangeListener.java +++ b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractDataTreeChangeListener.java @@ -14,8 +14,8 @@ import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.metrics.MetricProvider; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractSyncDataTreeChangeListener.java b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractSyncDataTreeChangeListener.java index b6a2bba..419d6e3 100644 --- a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractSyncDataTreeChangeListener.java +++ b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/AbstractSyncDataTreeChangeListener.java @@ -13,7 +13,7 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.metrics.MetricProvider; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/ChainableDataTreeChangeListener.java b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/ChainableDataTreeChangeListener.java index 0575206..9999dc4 100644 --- a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/ChainableDataTreeChangeListener.java +++ b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/ChainableDataTreeChangeListener.java @@ -8,7 +8,7 @@ package org.opendaylight.serviceutils.tools.listener; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; /** * {@link DataTreeChangeListener} which can notify another DataTreeChangeListener. diff --git a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/ChainableDataTreeChangeListenerImpl.java b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/ChainableDataTreeChangeListenerImpl.java index 294cdd9..df35312 100644 --- a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/ChainableDataTreeChangeListenerImpl.java +++ b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/ChainableDataTreeChangeListenerImpl.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataTreeModification; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/DataTreeChangeListenerActions.java b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/DataTreeChangeListenerActions.java index 32c777f..c3bb01d 100644 --- a/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/DataTreeChangeListenerActions.java +++ b/tools/listener-api/src/main/java/org/opendaylight/serviceutils/tools/listener/DataTreeChangeListenerActions.java @@ -11,7 +11,7 @@ import java.util.List; import javax.inject.Singleton; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.api.DataTreeModification; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/tools/pom.xml b/tools/pom.xml index 0f27dfa..0bd3ce9 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 INTERNAL org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.1 diff --git a/tools/testutils/pom.xml b/tools/testutils/pom.xml index 4a1fb67..692acc8 100644 --- a/tools/testutils/pom.xml +++ b/tools/testutils/pom.xml @@ -26,49 +26,49 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.serviceutils - rpc-api - ${project.version} + com.google.inject + guice + compile - org.opendaylight.mdsal - yang-binding + com.mycila.guice.extensions + mycila-guice-jsr250 + compile - org.opendaylight.yangtools - testutils + junit + junit compile - com.google.inject - guice + org.opendaylight.infrautils + infrautils-testutils compile - com.mycila.guice.extensions - mycila-guice-jsr250 - compile + org.opendaylight.serviceutils + rpc-api - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - test-jar + org.opendaylight.yangtools + binding-spec - junit - junit + org.opendaylight.yangtools + testutils compile + org.opendaylight.mdsal mdsal-binding-dom-adapter test + test-jar - org.opendaylight.infrautils - infrautils-testutils - compile + org.opendaylight.mdsal + mdsal-binding-dom-adapter + test diff --git a/tools/testutils/src/main/java/org/opendaylight/serviceutils/tools/mdsal/testutils/TestFutureRpcResults.java b/tools/testutils/src/main/java/org/opendaylight/serviceutils/tools/mdsal/testutils/TestFutureRpcResults.java index 0c9eaed..aa5e032 100644 --- a/tools/testutils/src/main/java/org/opendaylight/serviceutils/tools/mdsal/testutils/TestFutureRpcResults.java +++ b/tools/testutils/src/main/java/org/opendaylight/serviceutils/tools/mdsal/testutils/TestFutureRpcResults.java @@ -18,7 +18,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; import org.opendaylight.serviceutils.tools.rpc.FutureRpcResults; -import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.binding.DataObject; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; diff --git a/upgrade/pom.xml b/upgrade/pom.xml index a2e01b2..4a957fe 100644 --- a/upgrade/pom.xml +++ b/upgrade/pom.xml @@ -36,24 +36,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html true - org.opendaylight.yangtools - concepts + org.opendaylight.mdsal + mdsal-binding-api - org.opendaylight.yangtools - yang-common + org.opendaylight.mdsal + mdsal-common-api - org.opendaylight.mdsal - yang-binding + org.opendaylight.yangtools + binding-spec - org.opendaylight.mdsal - mdsal-common-api + org.opendaylight.yangtools + concepts - org.opendaylight.mdsal - mdsal-binding-api + org.opendaylight.yangtools + yang-common org.osgi -- 2.43.0 From 222c60091e0934ed4960803c7688fa00ba30f933 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Tue, 16 Jul 2024 22:29:20 +0000 Subject: [PATCH 3/3] Release Validate --- artifacts/pom.xml | 24 +++++++++---------- commons/binding-parent/pom.xml | 6 ++--- commons/pom.xml | 2 +- commons/quality-parent/pom.xml | 8 +++---- .../odl-infrautils-metrics-prometheus/pom.xml | 2 +- .../odl-infrautils-metrics-sample/pom.xml | 2 +- features/odl-serviceutils-listener/pom.xml | 6 ++--- features/odl-serviceutils-metrics/pom.xml | 4 ++-- features/odl-serviceutils-rpc/pom.xml | 4 ++-- features/odl-serviceutils-srm/pom.xml | 8 +++---- features/odl-serviceutils-tools/pom.xml | 10 ++++---- features/pom.xml | 2 +- features/serviceutils-features/pom.xml | 2 +- karaf/pom.xml | 2 +- metrics/api/pom.xml | 2 +- metrics/impl-prometheus/pom.xml | 2 +- metrics/impl-test/pom.xml | 2 +- metrics/impl/pom.xml | 2 +- metrics/it/pom.xml | 2 +- metrics/pom.xml | 2 +- metrics/sample/impl/pom.xml | 2 +- pom.xml | 2 +- srm/api/pom.xml | 2 +- srm/impl/pom.xml | 2 +- srm/pom.xml | 2 +- srm/shell/pom.xml | 2 +- tools/api/pom.xml | 2 +- tools/listener-api/pom.xml | 2 +- tools/pom.xml | 2 +- tools/rpc-api/pom.xml | 4 ++-- tools/testutils/pom.xml | 4 ++-- upgrade/pom.xml | 2 +- 32 files changed, 61 insertions(+), 61 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 2ada827..6853850 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils serviceutils-artifacts - 0.14.0-SNAPSHOT + 0.14.0 pom @@ -30,63 +30,63 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ${project.groupId} listener-api - 0.14.0-SNAPSHOT + 0.14.0 ${project.groupId} metrics-api - 0.14.0-SNAPSHOT + 0.14.0 ${project.groupId} metrics-impl - 0.14.0-SNAPSHOT + 0.14.0 ${project.groupId} metrics-impl - 0.14.0-SNAPSHOT + 0.14.0 config cfg ${project.groupId} metrics-impl-prometheus - 0.14.0-SNAPSHOT + 0.14.0 ${project.groupId} rpc-api - 0.14.0-SNAPSHOT + 0.14.0 ${project.groupId} srm-api - 0.14.0-SNAPSHOT + 0.14.0 ${project.groupId} tools-api - 0.14.0-SNAPSHOT + 0.14.0 ${project.groupId} upgrade - 0.14.0-SNAPSHOT + 0.14.0 ${project.groupId} srm-impl - 0.14.0-SNAPSHOT + 0.14.0 ${project.groupId} tools-testutils - 0.14.0-SNAPSHOT + 0.14.0 test diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml index f84b560..7142a98 100644 --- a/commons/binding-parent/pom.xml +++ b/commons/binding-parent/pom.xml @@ -12,13 +12,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.mdsal binding-parent - 14.0.0-SNAPSHOT + 14.0.0 org.opendaylight.serviceutils binding-parent - 0.14.0-SNAPSHOT + 0.14.0 pom @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.controller controller-artifacts - 10.0.0-SNAPSHOT + 10.0.0 pom import diff --git a/commons/pom.xml b/commons/pom.xml index f03907f..b6a229a 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils commons - 0.14.0-SNAPSHOT + 0.14.0 ODL :: serviceutils :: ${project.artifactId} diff --git a/commons/quality-parent/pom.xml b/commons/quality-parent/pom.xml index 8991140..d07dc8e 100644 --- a/commons/quality-parent/pom.xml +++ b/commons/quality-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 pom @@ -22,7 +22,7 @@ org.opendaylight.serviceutils serviceutils-artifacts - 0.14.0-SNAPSHOT + 0.14.0 pom import @@ -36,14 +36,14 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.0-SNAPSHOT + 14.0.0 pom import org.opendaylight.controller controller-artifacts - 10.0.0-SNAPSHOT + 10.0.0 pom import diff --git a/features/odl-infrautils-metrics-prometheus/pom.xml b/features/odl-infrautils-metrics-prometheus/pom.xml index 82510ea..8d8212e 100644 --- a/features/odl-infrautils-metrics-prometheus/pom.xml +++ b/features/odl-infrautils-metrics-prometheus/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.infrautils single-feature-parent - 3.5.0-SNAPSHOT + 3.5.0 ../parent diff --git a/features/odl-infrautils-metrics-sample/pom.xml b/features/odl-infrautils-metrics-sample/pom.xml index 42ee914..c271923 100644 --- a/features/odl-infrautils-metrics-sample/pom.xml +++ b/features/odl-infrautils-metrics-sample/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.infrautils single-feature-parent - 3.5.0-SNAPSHOT + 3.5.0 ../parent diff --git a/features/odl-serviceutils-listener/pom.xml b/features/odl-serviceutils-listener/pom.xml index 2347bc6..5f719e9 100644 --- a/features/odl-serviceutils-listener/pom.xml +++ b/features/odl-serviceutils-listener/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.serviceutils odl-serviceutils-listener - 0.14.0-SNAPSHOT + 0.14.0 feature ODL :: serviceutils :: listener tools @@ -20,14 +20,14 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.0-SNAPSHOT + 14.0.0 import pom org.opendaylight.serviceutils serviceutils-artifacts - 0.14.0-SNAPSHOT + 0.14.0 import pom diff --git a/features/odl-serviceutils-metrics/pom.xml b/features/odl-serviceutils-metrics/pom.xml index abbe730..a58a600 100644 --- a/features/odl-serviceutils-metrics/pom.xml +++ b/features/odl-serviceutils-metrics/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.serviceutils odl-serviceutils-metrics - 0.14.0-SNAPSHOT + 0.14.0 feature ODL :: serviceutils :: Metrics @@ -34,7 +34,7 @@ org.opendaylight.serviceutils serviceutils-artifacts - 0.14.0-SNAPSHOT + 0.14.0 import pom diff --git a/features/odl-serviceutils-rpc/pom.xml b/features/odl-serviceutils-rpc/pom.xml index c8480d4..f9e3449 100644 --- a/features/odl-serviceutils-rpc/pom.xml +++ b/features/odl-serviceutils-rpc/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.serviceutils odl-serviceutils-rpc - 0.14.0-SNAPSHOT + 0.14.0 feature ODL :: serviceutils :: RPC tools @@ -20,7 +20,7 @@ org.opendaylight.serviceutils serviceutils-artifacts - 0.14.0-SNAPSHOT + 0.14.0 pom import diff --git a/features/odl-serviceutils-srm/pom.xml b/features/odl-serviceutils-srm/pom.xml index ecbab1c..697c315 100644 --- a/features/odl-serviceutils-srm/pom.xml +++ b/features/odl-serviceutils-srm/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils odl-serviceutils-srm - 0.14.0-SNAPSHOT + 0.14.0 feature ODL :: serviceutils :: SRM @@ -41,17 +41,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils srm-api - 0.14.0-SNAPSHOT + 0.14.0 org.opendaylight.serviceutils srm-impl - 0.14.0-SNAPSHOT + 0.14.0 org.opendaylight.serviceutils srm-shell - 0.14.0-SNAPSHOT + 0.14.0 diff --git a/features/odl-serviceutils-tools/pom.xml b/features/odl-serviceutils-tools/pom.xml index 30509da..1f36004 100644 --- a/features/odl-serviceutils-tools/pom.xml +++ b/features/odl-serviceutils-tools/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils odl-serviceutils-tools - 0.14.0-SNAPSHOT + 0.14.0 feature ODL :: serviceutils :: TOOLS @@ -27,14 +27,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.controller controller-artifacts - 10.0.0-SNAPSHOT + 10.0.0 pom import org.opendaylight.serviceutils serviceutils-artifacts - 0.14.0-SNAPSHOT + 0.14.0 pom import @@ -63,12 +63,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils tools-api - 0.14.0-SNAPSHOT + 0.14.0 org.opendaylight.serviceutils upgrade - 0.14.0-SNAPSHOT + 0.14.0 diff --git a/features/pom.xml b/features/pom.xml index c0cbe45..404c3af 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils serviceutils-features-aggregator - 0.14.0-SNAPSHOT + 0.14.0 ODL :: serviceutils :: ${project.artifactId} diff --git a/features/serviceutils-features/pom.xml b/features/serviceutils-features/pom.xml index 8ca5528..c88ebae 100644 --- a/features/serviceutils-features/pom.xml +++ b/features/serviceutils-features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils serviceutils-features - 0.14.0-SNAPSHOT + 0.14.0 ODL :: serviceutils :: ${project.artifactId} feature diff --git a/karaf/pom.xml b/karaf/pom.xml index 86080a0..6be92b8 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 INTERNAL org.opendaylight.serviceutils serviceutils-karaf - 0.14.0-SNAPSHOT + 0.14.0 pom diff --git a/metrics/api/pom.xml b/metrics/api/pom.xml index e4c9ad3..22d1a2b 100644 --- a/metrics/api/pom.xml +++ b/metrics/api/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../commons/quality-parent diff --git a/metrics/impl-prometheus/pom.xml b/metrics/impl-prometheus/pom.xml index b82f15f..8a46d83 100644 --- a/metrics/impl-prometheus/pom.xml +++ b/metrics/impl-prometheus/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../commons/quality-parent diff --git a/metrics/impl-test/pom.xml b/metrics/impl-test/pom.xml index c651a4e..c6ae219 100644 --- a/metrics/impl-test/pom.xml +++ b/metrics/impl-test/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../commons/quality-parent diff --git a/metrics/impl/pom.xml b/metrics/impl/pom.xml index eb7bd02..6896cbf 100644 --- a/metrics/impl/pom.xml +++ b/metrics/impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../commons/quality-parent diff --git a/metrics/it/pom.xml b/metrics/it/pom.xml index fd678c1..e224711 100644 --- a/metrics/it/pom.xml +++ b/metrics/it/pom.xml @@ -22,7 +22,7 @@ ODL :: serviceutils :: ${project.artifactId} - 0.14.0-SNAPSHOT + 0.14.0 diff --git a/metrics/pom.xml b/metrics/pom.xml index 2232dde..44699f6 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -19,7 +19,7 @@ org.opendaylight.serviceutils metrics-aggregator - 0.14.0-SNAPSHOT + 0.14.0 pom diff --git a/metrics/sample/impl/pom.xml b/metrics/sample/impl/pom.xml index af1684f..25c9a5a 100644 --- a/metrics/sample/impl/pom.xml +++ b/metrics/sample/impl/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../../commons/quality-parent diff --git a/pom.xml b/pom.xml index 8e89ca7..fb81a2e 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils serviceutils-aggregator - 0.14.0-SNAPSHOT + 0.14.0 serviceutils pom diff --git a/srm/api/pom.xml b/srm/api/pom.xml index 41b0e35..8fb1200 100644 --- a/srm/api/pom.xml +++ b/srm/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.serviceutils binding-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../commons/binding-parent diff --git a/srm/impl/pom.xml b/srm/impl/pom.xml index a5149c4..dca5a30 100644 --- a/srm/impl/pom.xml +++ b/srm/impl/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../commons/quality-parent diff --git a/srm/pom.xml b/srm/pom.xml index 154e104..1faffdc 100644 --- a/srm/pom.xml +++ b/srm/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils srm-aggregator - 0.14.0-SNAPSHOT + 0.14.0 ODL :: serviceutils :: ${project.artifactId} diff --git a/srm/shell/pom.xml b/srm/shell/pom.xml index 9fcc046..0824331 100644 --- a/srm/shell/pom.xml +++ b/srm/shell/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../commons/quality-parent diff --git a/tools/api/pom.xml b/tools/api/pom.xml index 666dee7..75e2a0b 100644 --- a/tools/api/pom.xml +++ b/tools/api/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../commons/quality-parent/ diff --git a/tools/listener-api/pom.xml b/tools/listener-api/pom.xml index 494178a..6c92632 100644 --- a/tools/listener-api/pom.xml +++ b/tools/listener-api/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../commons/quality-parent diff --git a/tools/pom.xml b/tools/pom.xml index 0bd3ce9..359ad1e 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.serviceutils tools-aggregator - 0.14.0-SNAPSHOT + 0.14.0 ODL :: serviceutils :: ${project.artifactId} diff --git a/tools/rpc-api/pom.xml b/tools/rpc-api/pom.xml index a9492b3..5ca7938 100644 --- a/tools/rpc-api/pom.xml +++ b/tools/rpc-api/pom.xml @@ -7,13 +7,13 @@ org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../commons/quality-parent/ org.opendaylight.serviceutils rpc-api - 0.14.0-SNAPSHOT + 0.14.0 bundle diff --git a/tools/testutils/pom.xml b/tools/testutils/pom.xml index 692acc8..4772400 100644 --- a/tools/testutils/pom.xml +++ b/tools/testutils/pom.xml @@ -13,13 +13,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.serviceutils quality-parent - 0.14.0-SNAPSHOT + 0.14.0 ../../commons/quality-parent/ org.opendaylight.serviceutils tools-testutils - 0.14.0-SNAPSHOT + 0.14.0 ODL :: serviceutils :: ${project.artifactId} diff --git a/upgrade/pom.xml b/upgrade/pom.xml index 4a957fe..9534315 100644 --- a/upgrade/pom.xml +++ b/upgrade/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.serviceutils binding-parent - 0.14.0-SNAPSHOT + 0.14.0 ../commons/binding-parent -- 2.43.0