From c6ff622d2bbe4658ab02439acb1e934f6da42d81 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 10 Oct 2025 13:05:57 -0400 Subject: [PATCH] Update to use released Quebec parent pom Update to use released version of parent pom to avoid compile errors due to expired snapshot. Issue-ID: CCSDK-4136 Change-Id: Iad4890acfa0afdb81daad1ce76452bb0c9a63369 Signed-off-by: Dan Timoney --- ms/neng/pom.xml | 1 - ms/pom.xml | 1 - ms/sliboot/pom.xml | 8 ++++---- ms/sliboot/src/main/resources/startSliboot.sh | 2 +- pom.xml | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml index 59e1928f..3b4c6a94 100644 --- a/ms/neng/pom.xml +++ b/ms/neng/pom.xml @@ -18,7 +18,6 @@ * limitations under the License. * ============LICENSE_END========================================================= --> - 4.0.0 diff --git a/ms/pom.xml b/ms/pom.xml index c0ad27f9..67316a28 100644 --- a/ms/pom.xml +++ b/ms/pom.xml @@ -18,7 +18,6 @@ * limitations under the License. * ============LICENSE_END========================================================= --> - 4.0.0 diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml index a07e91b2..b75619a4 100644 --- a/ms/sliboot/pom.xml +++ b/ms/sliboot/pom.xml @@ -17,11 +17,11 @@ org.onap.ccsdk.apps.ms.sliboot.SlibootApp - onap/ccsdk-alpine-j17-image - 1.6.2 + onap/ccsdk-alpine-j21-image + 2.2-STAGING-latest onap/ccsdk-sliboot-alpine-image ${project.version} - 1.6.2 + 2.2.0-SNAPSHOT ${maven.build.timestamp} yyyyMMdd'T'HHmmss'Z' ${project.artifactId}-${project.version}-exec.jar @@ -294,7 +294,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 ${basedir}/src/test/resources @@ -507,6 +506,7 @@ sli abc123 sdnctl + itsASecret dbhost /opt/onap/ccsdk/config diff --git a/ms/sliboot/src/main/resources/startSliboot.sh b/ms/sliboot/src/main/resources/startSliboot.sh index 7341b411..797a9362 100644 --- a/ms/sliboot/src/main/resources/startSliboot.sh +++ b/ms/sliboot/src/main/resources/startSliboot.sh @@ -33,7 +33,7 @@ export MYSQL_DB_HOST=${MYSQL_DB_HOST:-dbhost} # Wait for database # echo "Waiting for database" -until mysqladmin ping -h ${MYSQL_DB_HOST} --silent +until mysql -h ${MYSQL_DB_HOST} -u root -p${MYSQL_ROOT_PASSWORD} mysql &> /dev/null do printf "." sleep 1 diff --git a/pom.xml b/pom.xml index 98c6e09a..e8d92841 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-30-starter-parent - 3.2.0-SNAPSHOT + 3.2.0 -- 2.16.6