From 2f11eebcc264e77a7fe5440178e910764278c9ff Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 18 May 2020 08:39:04 -0400
Subject: [PATCH] Add/correct property settings

Added ccsdk.features.version property to parent pom and fixed versions
of SDC libraries to latest released versions.

Change-Id: Ia431e5731a430f7cc45d0448d33fbb3808c2c5e9
Issue-ID: CCSDK-2378
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 odlparent/binding-parent/pom.xml                                 | 1 +
 odlparent/bundle-parent/pom.xml                                  | 1 +
 odlparent/feature-repo-parent/pom.xml                            | 1 +
 odlparent/karaf4-parent/pom.xml                                  | 1 +
 odlparent/mdsal-it-parent/pom.xml                                | 1 +
 odlparent/odlparent-lite/pom.xml                                 | 1 +
 odlparent/odlparent/pom.xml                                      | 1 +
 odlparent/setup/src/main/resources/pom-template.xml              | 1 +
 odlparent/single-feature-parent/pom.xml                          | 1 +
 oparent/pom.xml                                                  | 9 +++++++++
 springboot/spring-boot-setup/src/main/resources/pom-template.xml | 1 +
 springboot/springboot1/pom.xml                                   | 1 +
 springboot/springboot2/pom.xml                                   | 1 +
 standalone/pom.xml                                               | 4 ++--
 14 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index af37d1f7..3bc6b66b 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -97,6 +97,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 2515e8cf..20c44cd6 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -97,6 +97,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 5f0d9cca..c408eae9 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -97,6 +97,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index ccdd83dc..78c64ad7 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -97,6 +97,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index aafeaed6..3ae78dbe 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -97,6 +97,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 4f2e154b..3477381d 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -97,6 +97,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 22f5b7ca..9a20a1c0 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -97,6 +97,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index f5f15f99..81f4becc 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -97,6 +97,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 2b3e59e4..9aec6ac8 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -97,6 +97,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index b93a378f..86ef1e2e 100755
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -55,7 +55,16 @@
         <bundle.plugin.version>2.5.0</bundle.plugin.version>
         <checkstyle.skip>true</checkstyle.skip>
 
+        <!-- CCSDK component versions -->
+        <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
+        <ccsdk.sli.plugins.version>1.0.0-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdk.distribution.version>1.0.0-SNAPSHOT</ccsdk.distribution.version>
 
+        
         <mariadb.connector.version>2.1.1</mariadb.connector.version>
         <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version>
         <velocity.version>2.0</velocity.version>
diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
index 3576baaa..bb107194 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -92,6 +92,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 32b17207..380654d0 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -92,6 +92,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 83efe046..65b73cad 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -92,6 +92,7 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
diff --git a/standalone/pom.xml b/standalone/pom.xml
index f5f94397..3559a1e5 100755
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -61,8 +61,8 @@
         <velocity.version>2.0</velocity.version>
 
         <dmaap.listener.version>1.1.5</dmaap.listener.version>
-        <sdc.client.version>1.4.0</sdc.client.version>
-        <sdc.tosca.version>1.6.3</sdc.tosca.version>
+        <sdc.client.version>1.4.1</sdc.client.version>
+        <sdc.tosca.version>1.6.5</sdc.tosca.version>
 
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
 
-- 
2.16.6