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, 18 insertions, 72 deletions

diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml
index ecd5ac980..6aee4a21b 100755
--- a/adaptors/aai-service/provider/pom.xml
+++ b/adaptors/aai-service/provider/pom.xml
@@ -16,16 +16,12 @@
 
     <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml
index 403b20e64..d27c417e8 100644
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml
+++ b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml
@@ -30,16 +30,12 @@
 
     <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml
index 61c340375..9f99a7169 100644
--- a/adaptors/features/ccsdk-aai-service/pom.xml
+++ b/adaptors/features/ccsdk-aai-service/pom.xml
@@ -16,16 +16,12 @@
 
     <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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>
             <scope>provided</scope>
diff --git a/adaptors/features/ccsdk-ansible-adapter/pom.xml b/adaptors/features/ccsdk-ansible-adapter/pom.xml
index 12e2ef28b..f68826cf0 100644
--- a/adaptors/features/ccsdk-ansible-adapter/pom.xml
+++ b/adaptors/features/ccsdk-ansible-adapter/pom.xml
@@ -16,16 +16,12 @@
 
     <name>ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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>
             <scope>provided</scope>
diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml
index c1ac42cd0..f3ee919ac 100644
--- a/adaptors/features/ccsdk-mdsal-resource/pom.xml
+++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml
@@ -16,16 +16,12 @@
 
     <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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>
             <scope>provided</scope>
diff --git a/adaptors/features/ccsdk-netbox-client/pom.xml b/adaptors/features/ccsdk-netbox-client/pom.xml
index 9d79c7818..8dadba91f 100644
--- a/adaptors/features/ccsdk-netbox-client/pom.xml
+++ b/adaptors/features/ccsdk-netbox-client/pom.xml
@@ -32,16 +32,12 @@
 
     <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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>
             <scope>provided</scope>
@@ -50,7 +46,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-dblib</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
             <scope>provided</scope>
diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml
index 4932e7456..024deeaae 100644
--- a/adaptors/features/ccsdk-resource-assignment/pom.xml
+++ b/adaptors/features/ccsdk-resource-assignment/pom.xml
@@ -16,16 +16,12 @@
 
     <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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>
             <scope>provided</scope>
@@ -34,7 +30,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-dblib</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
             <scope>provided</scope>
diff --git a/adaptors/features/ccsdk-saltstack-adapter/pom.xml b/adaptors/features/ccsdk-saltstack-adapter/pom.xml
index aca4707c4..153bb9b89 100644
--- a/adaptors/features/ccsdk-saltstack-adapter/pom.xml
+++ b/adaptors/features/ccsdk-saltstack-adapter/pom.xml
@@ -16,15 +16,11 @@
 
     <name>ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
index 4fe10f7da..6e80ed96b 100644
--- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
+++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
@@ -16,10 +16,6 @@
 
     <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/adaptors/features/ccsdk-sql-resource/pom.xml b/adaptors/features/ccsdk-sql-resource/pom.xml
index c5c6db660..50cddba0d 100644
--- a/adaptors/features/ccsdk-sql-resource/pom.xml
+++ b/adaptors/features/ccsdk-sql-resource/pom.xml
@@ -16,16 +16,13 @@
 
     <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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>
             <scope>provided</scope>
@@ -33,7 +30,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-dblib</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
             <scope>provided</scope>
diff --git a/adaptors/features/features-sli-adaptors/pom.xml b/adaptors/features/features-sli-adaptors/pom.xml
index 697b5cdf2..ddb0efac9 100644
--- a/adaptors/features/features-sli-adaptors/pom.xml
+++ b/adaptors/features/features-sli-adaptors/pom.xml
@@ -16,10 +16,6 @@
 
     <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/adaptors/mdsal-resource/provider/pom.xml b/adaptors/mdsal-resource/provider/pom.xml
index f077096cc..5cd1384d9 100755
--- a/adaptors/mdsal-resource/provider/pom.xml
+++ b/adaptors/mdsal-resource/provider/pom.xml
@@ -19,7 +19,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
     </properties>
 
     <dependencyManagement>
@@ -27,7 +26,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/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml
index 23e3213a4..bbad98a2f 100644
--- a/adaptors/netbox-client/provider/pom.xml
+++ b/adaptors/netbox-client/provider/pom.xml
@@ -32,16 +32,12 @@
 
     <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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>
@@ -76,7 +72,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-provider</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/adaptors/resource-assignment/provider/pom.xml b/adaptors/resource-assignment/provider/pom.xml
index c0155a169..7c3af582f 100755
--- a/adaptors/resource-assignment/provider/pom.xml
+++ b/adaptors/resource-assignment/provider/pom.xml
@@ -19,7 +19,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
     </properties>
 
     <dependencyManagement>
@@ -27,7 +26,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/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml
index 924e94098..fc697d42d 100644
--- a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml
+++ b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml
@@ -30,16 +30,12 @@
     <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
     </name>
 
-    <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.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/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml
index 0afabe457..0d89bdfd8 100755
--- a/adaptors/sql-resource/provider/pom.xml
+++ b/adaptors/sql-resource/provider/pom.xml
@@ -19,7 +19,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
     </properties>
 
     <dependencyManagement>
@@ -27,7 +26,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>