diff options
author | Dan Timoney <dtimoney@att.com> | 2021-07-27 16:47:39 -0400 |
---|---|---|
committer | KAPIL SINGAL <ks220y@att.com> | 2021-07-29 18:16:20 +0000 |
commit | 4d2a4e187187e726e99fa85e32bfbe101567a83f (patch) | |
tree | e43f2786190a91593ae2cf7ab890b900a03b27c3 | |
parent | d70d7624795a9305eef1f0a6d3842d47ecd27160 (diff) |
Update to support use of version ranges
Updates to allow use of ranges in CCSDK version properties.
Issue-ID: CCSDK-3387
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Icabcfc40b91e7204aa2e1d6c1ed6a47dcb7d4a05
-rw-r--r-- | sdnr/northbound/CMNotify/provider/pom.xml | 13 | ||||
-rw-r--r-- | sdnr/northbound/oofpcipoc/consumer/pom.xml | 11 | ||||
-rw-r--r-- | sdnr/northbound/oofpcipoc/provider/pom.xml | 13 | ||||
-rw-r--r-- | sdnr/northbound/ranSlice/provider/pom.xml | 17 |
4 files changed, 11 insertions, 43 deletions
diff --git a/sdnr/northbound/CMNotify/provider/pom.xml b/sdnr/northbound/CMNotify/provider/pom.xml index 32781ab36..c31ca187e 100644 --- a/sdnr/northbound/CMNotify/provider/pom.xml +++ b/sdnr/northbound/CMNotify/provider/pom.xml @@ -37,17 +37,6 @@ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> @@ -65,11 +54,13 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> + <version>${ccsdk.sli.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> + <version>${ccsdk.sli.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/sdnr/northbound/oofpcipoc/consumer/pom.xml b/sdnr/northbound/oofpcipoc/consumer/pom.xml index 7fc7e4a78..ea7302ba5 100644 --- a/sdnr/northbound/oofpcipoc/consumer/pom.xml +++ b/sdnr/northbound/oofpcipoc/consumer/pom.xml @@ -46,13 +46,6 @@ <type>pom</type> <scope>import</scope> </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> </dependencies> </dependencyManagement> <dependencies> @@ -98,17 +91,19 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> + <version>${ccsdk.sli.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> + <version>${ccsdk.sli.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>utils-provider</artifactId> - <!-- <version>${sdnctl.sli.version}</version> --> + <version>${ccsdk.sli.version}</version> </dependency> <dependency> <groupId>org.apache.velocity</groupId> diff --git a/sdnr/northbound/oofpcipoc/provider/pom.xml b/sdnr/northbound/oofpcipoc/provider/pom.xml index aef50c611..a7f371b9d 100644 --- a/sdnr/northbound/oofpcipoc/provider/pom.xml +++ b/sdnr/northbound/oofpcipoc/provider/pom.xml @@ -37,17 +37,6 @@ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> @@ -65,11 +54,13 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> + <version>${ccsdk.sli.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> + <version>${ccsdk.sli.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/sdnr/northbound/ranSlice/provider/pom.xml b/sdnr/northbound/ranSlice/provider/pom.xml index 1efaf1b6d..f33aec69f 100644 --- a/sdnr/northbound/ranSlice/provider/pom.xml +++ b/sdnr/northbound/ranSlice/provider/pom.xml @@ -37,17 +37,6 @@ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> @@ -89,17 +78,19 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> + <version>${ccsdk.sli.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> + <version>${ccsdk.sli.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>utils-provider</artifactId> - <!-- <version>${sdnctl.sli.version}</version> --> + <version>${ccsdk.sli.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -109,7 +100,7 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider-base</artifactId> - <version>${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.version}</version> <scope>provided</scope> </dependency> </dependencies> |