From eb6f9410f28eea77c25d4bec4d3594c7624b2c9e Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 8 Jan 2021 10:57:43 -0500
Subject: [PATCH] Update oran and features versions for Guilin mtce release

Update oran and features versions for Guilin mtce release.  Both need to
be released because they depend on ccsdk/sli, which has fixes.

Change-Id: Ie6d33302020b51a9a0313decbd7c7e160ec9e239
Issue-ID: CCSDK-3074
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 odlparent/binding-parent/pom.xml                                 | 7 ++++---
 odlparent/bundle-parent/pom.xml                                  | 7 ++++---
 odlparent/feature-repo-parent/pom.xml                            | 7 ++++---
 odlparent/karaf4-parent/pom.xml                                  | 7 ++++---
 odlparent/mdsal-it-parent/pom.xml                                | 7 ++++---
 odlparent/odlparent-lite/pom.xml                                 | 7 ++++---
 odlparent/odlparent/pom.xml                                      | 7 ++++---
 odlparent/setup/src/main/resources/pom-template.xml              | 7 ++++---
 odlparent/single-feature-parent/pom.xml                          | 7 ++++---
 springboot/spring-boot-setup/src/main/resources/pom-template.xml | 7 ++++---
 springboot/springboot1/pom.xml                                   | 7 ++++---
 springboot/springboot2/pom.xml                                   | 7 ++++---
 12 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 531ed967..4a9c0be5 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -97,13 +97,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 352a4ed4..699ee295 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -97,13 +97,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index d54c6219..4bbf22ec 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -97,13 +97,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index c20d6398..3d9462d1 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -97,13 +97,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index cf2a5629..8117186e 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -97,13 +97,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 60ff35d9..42acd071 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -97,13 +97,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 9c964aff..f2a95618 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -97,13 +97,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 95c58f13..62a3ea71 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -97,13 +97,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>\${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>\${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>\${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>\${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.version>
         <sdnctl.sli.version>\${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>\${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>\${ccsdk.sli.core.version}</sdnctl.dblib.version>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 4d891545..5239b55f 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -97,13 +97,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.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 2504d68f..e9640b8d 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -92,13 +92,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>\${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>\${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>\${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>\${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.version>
 
         <!-- Spring versions -->
         <spring.boot.version>${springbootparent.version}</spring.boot.version>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 6954eeff..f2a0f20e 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -92,13 +92,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.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 8fbe181f..ea7c0c39 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -92,13 +92,14 @@
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.0.3</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.3</ccsdk.features.version>
-        <ccsdk.sli.version>1.0.4-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.0.4-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.0.2-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.sli.version>1.0.4</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.4-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.5-SNAPSHOT</ccsdk.distribution.version>
 
         <!-- Spring versions -->
         <spring.boot.version>2.3.3.RELEASE</spring.boot.version>
-- 
2.16.6