From edf35cc14cbfed4904ed2d85520eb5144e3c1d4c Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 19 Jun 2024 09:29:19 -0400
Subject: Resolve build failure

Update dependency to use released version rather than snapshot

Issue-ID: CCSDK-4018
Change-Id: Ibaf9d855621069ec0e5db2cdfad21704561317b6
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 cadi/core/pom.xml      | 2 +-
 cadi/pom.xml           | 4 ++--
 docs/tox.ini           | 6 +++---
 ms/neng/pom.xml        | 8 ++++----
 ms/pom.xml             | 4 ++--
 ms/sliboot/pom.xml     | 8 ++++----
 ms/vlantag-api/pom.xml | 6 +++---
 pom.xml                | 2 +-
 services/pom.xml       | 4 ++--
 version.properties     | 2 +-
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml
index 7ee4c223..84c995a7 100644
--- a/cadi/core/pom.xml
+++ b/cadi/core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps-cadi</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/cadi/pom.xml b/cadi/pom.xml
index f26befa2..4bfd36c5 100755
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
 	    <artifactId>ccsdk-apps</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>ccsdk-apps-cadi</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-apps-cadi</name>
diff --git a/docs/tox.ini b/docs/tox.ini
index b9d7eb44..46075fa6 100644
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -7,7 +7,7 @@ skipsdist = true
 basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
-    -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
+    -chttps://releases.openstack.org/constraints/upper/yoga
     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
 commands =
     sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html
@@ -16,7 +16,7 @@ commands =
 basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
-    -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
+    -chttps://releases.openstack.org/constraints/upper/yoga
     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
 commands =
     sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck
@@ -25,7 +25,7 @@ commands =
 basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
-    -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
+    -chttps://releases.openstack.org/constraints/upper/yoga
     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
 commands =
     sphinx-build -W -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck
diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index 36bb45c2..3869609e 100644
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps-ms</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>ccsdk-apps-ms-neng</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
 
     <name>Naming Generation</name>
 
@@ -54,13 +54,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sdk.java.rest>6.2.0.11</sdk.java.rest>
         <serviceArtifactName>ms-networkelementnamegen</serviceArtifactName>
-        <ccsdk.distribution.version>1.5.0-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.5.2</ccsdk.distribution.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <docker.push.phase>deploy</docker.push.phase>
         <docker.verbose>true</docker.verbose>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <base.image.name>onap/ccsdk-alpine-j11-image</base.image.name>
-        <base.image.version>1.5-STAGING-latest</base.image.version>
+        <base.image.version>1.5.2</base.image.version>
         <image.name>onap/ccsdk-apps-ms-neng</image.name>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>    
diff --git a/ms/pom.xml b/ms/pom.xml
index c973c834..5147ab6d 100644
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ccsdk-apps-ms</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Micro-services Root</name>
diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index 30071cb0..8f67f3ea 100644
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps-ms</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>sliboot</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ccsdk-apps :: sliboot :: ${project.artifactId}</name>
@@ -18,10 +18,10 @@
     <properties>
         <start-class>org.onap.ccsdk.apps.ms.sliboot.SlibootApp</start-class>
         <base.image.name>onap/ccsdk-alpine-j17-image</base.image.name>
-        <base.image.version>1.6-STAGING-latest</base.image.version>
+        <base.image.version>1.6.2</base.image.version>
         <image.name>onap/ccsdk-sliboot-alpine-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <ccsdk.distribution.version>1.6.0-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.6.2</ccsdk.distribution.version>
         <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <ccsdk.sliboot.jar>${project.artifactId}-${project.version}-exec.jar</ccsdk.sliboot.jar>
diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml
index 543b49aa..1f5d9f06 100644
--- a/ms/vlantag-api/pom.xml
+++ b/ms/vlantag-api/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps-ms</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.apps.ms.vlantagapi</groupId>
     <artifactId>vlantag-api</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Vlantag API</name>
@@ -33,7 +33,7 @@
         <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
 
         <base.image.name>onap/ccsdk-alpine-j11-image</base.image.name>
-        <base.image.version>1.5-STAGING-latest</base.image.version>
+        <base.image.version>1.5.2</base.image.version>
     </properties>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index cd55accd..1c2471be 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>ccsdk-apps</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-apps</name>
diff --git a/services/pom.xml b/services/pom.xml
index 9665b22f..af1377fe 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>services</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ccsdk-apps :: services :: ${project.artifactId}</name>
diff --git a/version.properties b/version.properties
index 576a5c90..3252a48b 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 
 release_name=1
-sprint_number=6
+sprint_number=7
 feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
-- 
cgit 1.2.3-korg