From be5662d19f464ab6e0c79c348e893a35ce780aea Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 7 Dec 2020 12:23:05 -0500 Subject: Remove references to indivdual repo version properties Updated combined ccsdl/sli repo to replace references to old repo versions (e.g. ccsdk.sli.core.version) with build-in maven property project.version. Issue-ID: CCSDK-3009 Signed-off-by: Dan Timoney Change-Id: I89c42dd571781f9bd8f9b463f53298519f61b96f --- northbound/artifacts/pom.xml | 4 ---- northbound/asdcApi/model/pom.xml | 4 ---- northbound/asdcApi/pom.xml | 3 --- northbound/asdcApi/provider/pom.xml | 6 +----- northbound/dataChange/model/pom.xml | 3 --- northbound/dataChange/provider/pom.xml | 6 +----- northbound/dmaap-listener/pom.xml | 4 +--- northbound/features/ccsdk-asdcApi/pom.xml | 6 +----- northbound/features/ccsdk-daexim-offsite-backup/pom.xml | 2 +- northbound/features/ccsdk-dataChange/pom.xml | 6 +----- northbound/features/ccsdk-lcm/pom.xml | 6 +----- northbound/features/ccsdk-sli-northbound-all/pom.xml | 4 ---- northbound/features/features-sli-northbound/pom.xml | 4 ---- northbound/lcm/model/pom.xml | 4 ---- northbound/lcm/provider/pom.xml | 8 ++------ northbound/ueb-listener/pom.xml | 4 +--- 16 files changed, 10 insertions(+), 64 deletions(-) (limited to 'northbound') diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index 3e7ae12e5..fc3496ebd 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -20,10 +20,6 @@ ONAP - - ${project.version} - - diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index ede2bca16..a31cd3079 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -16,10 +16,6 @@ ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} - - ${project.version} - - diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index 203946e2e..9dfe29782 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -22,7 +22,4 @@ installer - - ${project.version} - diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml index c267fc0c4..a308ff5a1 100755 --- a/northbound/asdcApi/provider/pom.xml +++ b/northbound/asdcApi/provider/pom.xml @@ -16,16 +16,12 @@ ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} - - ${project.version} - - org.onap.ccsdk.sli.core sli-core-artifacts - ${ccsdk.sli.core.version} + ${project.version} pom import diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index b006fffb5..1e8202670 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -16,9 +16,6 @@ ccsdk-sli-northbound :: dataChange :: ${project.artifactId} - - ${project.version} - diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index 70c9b0e45..5c4d259d3 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -16,16 +16,12 @@ ccsdk-sli-northbound :: dataChange :: ${project.artifactId} - - ${project.version} - - org.onap.ccsdk.sli.core sli-core-artifacts - ${ccsdk.sli.core.version} + ${project.version} pom import diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index 664c8cc47..fcc069607 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -24,8 +24,6 @@ ${maven.build.timestamp} ${project.version}-${build.number} - 1.1.0 - ${project.version} @@ -33,7 +31,7 @@ org.onap.ccsdk.sli.core sli-core-artifacts - ${ccsdk.sli.core.version} + ${project.version} pom import diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index 951c8a792..799d499c7 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -16,15 +16,11 @@ ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} - - ${project.version} - - org.onap.ccsdk.sli.core ccsdk-sli - ${ccsdk.sli.core.version} + ${project.version} xml features diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index b7ce893ac..932c55aa2 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -26,7 +26,7 @@ org.onap.ccsdk.sli.core ccsdk-sli - ${ccsdk.sli.core.version} + ${project.version} xml features provided diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index a39d456bd..4d6aec730 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -16,16 +16,12 @@ ccsdk-sli-northbound :: dataChange :: ${project.artifactId} - - ${project.version} - - org.onap.ccsdk.sli.core ccsdk-sli - ${ccsdk.sli.core.version} + ${project.version} xml features diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index b4869bf71..aef5e161a 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -16,16 +16,12 @@ ccsdk-sli-northbound :: lcm :: ${project.artifactId} - - ${project.version} - - org.onap.ccsdk.sli.core ccsdk-sli - ${ccsdk.sli.core.version} + ${project.version} xml features diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index 80d68d99b..75675e3bb 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -16,10 +16,6 @@ ccsdk-sli-northbound :: features :: ${project.artifactId} - - ${project.version} - - ${project.groupId} diff --git a/northbound/features/features-sli-northbound/pom.xml b/northbound/features/features-sli-northbound/pom.xml index 95671fc25..6afb797d0 100644 --- a/northbound/features/features-sli-northbound/pom.xml +++ b/northbound/features/features-sli-northbound/pom.xml @@ -16,10 +16,6 @@ ccsdk-sli-northbound :: features :: ${project.artifactId} - - ${project.version} - - ${project.groupId} diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index f467200e0..c86b9caff 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -16,10 +16,6 @@ ccsdk-sli-northbound :: lcm :: ${project.artifactId} - - ${project.version} - - diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index 9f7aae85c..0414f8f2f 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -16,16 +16,12 @@ ccsdk-sli-northbound :: lcm :: ${project.artifactId} - - ${project.version} - - org.onap.ccsdk.sli.core sli-core-artifacts - ${ccsdk.sli.core.version} + ${project.version} pom import @@ -62,7 +58,7 @@ org.onap.ccsdk.sli.core sli-provider-base - ${ccsdk.sli.core.version} + ${project.version} org.opendaylight.controller diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index 81898a53d..cd9429704 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -22,8 +22,6 @@ yyyyMMdd'T'HHmmss'Z' ${maven.build.timestamp} ${project.version}-${build.number} - 1.1.0 - ${project.version} 1.4.1 1.6.5 @@ -33,7 +31,7 @@ org.onap.ccsdk.sli.core sli-core-artifacts - ${ccsdk.sli.core.version} + ${project.version} pom import -- cgit 1.2.3-korg