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 <dtimoney@att.com>
Change-Id: I89c42dd571781f9bd8f9b463f53298519f61b96f

16 files changed, 10 insertions, 64 deletions

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 @@
         <name>ONAP</name>
     </organization>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
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 @@
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
     <dependencies>
 
         <dependency>
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 @@
         <module>installer</module>
     </modules>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
 </project>
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 @@
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
     <dependencyManagement>
     	<dependencies>
     		<dependency>
   <groupId>org.onap.ccsdk.sli.core</groupId>
   <artifactId>sli-core-artifacts</artifactId>
-  <version>${ccsdk.sli.core.version}</version>
+  <version>${project.version}</version>
   <type>pom</type>
   <scope>import</scope>
     		</dependency>
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 @@
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
 
     <dependencies>
         <dependency>
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 @@
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
     <dependencyManagement>
     	<dependencies>
     		<dependency>
   <groupId>org.onap.ccsdk.sli.core</groupId>
   <artifactId>sli-core-artifacts</artifactId>
-  <version>${ccsdk.sli.core.version}</version>
+  <version>${project.version}</version>
   <type>pom</type>
   <scope>import</scope>
     		</dependency>
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 @@
         <build.number>${maven.build.timestamp}</build.number>
         <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
 
-        <ccsdk.sli.core.version>1.1.0</ccsdk.sli.core.version>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
     </properties>
 
     <dependencyManagement>
@@ -33,7 +31,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-core-artifacts</artifactId>
-                <version>${ccsdk.sli.core.version}</version>
+                <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
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 @@
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
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 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
             <scope>provided</scope>
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 @@
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
     <dependencies>
 
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
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 @@
 
     <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
     <dependencies>
 
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
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 @@
 
     <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</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 @@
 
     <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</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 @@
 
     <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
     <dependencies>
 
         <dependency>
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 @@
 
     <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
     <dependencyManagement>
     	<dependencies>
     		<dependency>
   <groupId>org.onap.ccsdk.sli.core</groupId>
   <artifactId>sli-core-artifacts</artifactId>
-  <version>${ccsdk.sli.core.version}</version>
+  <version>${project.version}</version>
   <type>pom</type>
   <scope>import</scope>
     		</dependency>
@@ -62,7 +58,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider-base</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
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 @@
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <build.number>${maven.build.timestamp}</build.number>
         <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
-        <ccsdk.sli.core.version>1.1.0</ccsdk.sli.core.version>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
         <sdc.client.version>1.4.1</sdc.client.version>
 	<sdc.tosca.version>1.6.5</sdc.tosca.version>
     </properties>
@@ -33,7 +31,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-core-artifacts</artifactId>
-                <version>${ccsdk.sli.core.version}</version>
+                <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>