From a265d5be417269a7814e2e71e7dad7c0719f4770 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 25 Nov 2020 08:23:08 -0500
Subject: Add missing dependencies to ccsdk oparent and fix versions

Some version declarations were missing from CCSDK oparent, which
causes problems when moving repos to use CCSDK oparent pom instead
of ODL-based parents. Also, update version properies to latest CCSDK
master snapshot versions.

Change-Id: Ia9222da0f8720f981cfcd98aaeaafc68aedbcb92
Issue-ID: CCSDK-3001
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 .../spring-boot-setup/src/main/resources/pom-template.xml | 15 ++++++++-------
 springboot/springboot1/pom.xml                            | 15 ++++++++-------
 springboot/springboot2/pom.xml                            | 15 ++++++++-------
 3 files changed, 24 insertions(+), 21 deletions(-)

(limited to 'springboot')

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 d207178b..2912ac0d 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -91,13 +91,14 @@
         <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.sli.core.version>${ccsdl.sli.version}</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+        <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
 
         <!-- Spring versions -->
         <spring.boot.version>${springbootparent.version}</spring.boot.version>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index cdbdc9f2..98d13fc3 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -91,13 +91,14 @@
         <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.sli.core.version>${ccsdl.sli.version}</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+        <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
 
         <!-- Spring versions -->
         <spring.boot.version>1.5.22.RELEASE</spring.boot.version>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 148179f5..77bd08ca 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -91,13 +91,14 @@
         <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.sli.core.version>${ccsdl.sli.version}</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+        <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
 
         <!-- Spring versions -->
         <spring.boot.version>2.3.3.RELEASE</spring.boot.version>
-- 
cgit 1.2.3-korg