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 <dt5972@att.com>

diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index 59e1928..3b4c6a9 100644 (file)
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -18,7 +18,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ms/pom.xml b/ms/pom.xml
index c0ad27f..67316a2 100644 (file)
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -18,7 +18,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index a07e91b..b75619a 100644 (file)
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -17,11 +17,11 @@
 
     <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.2</base.image.version>
+        <base.image.name>onap/ccsdk-alpine-j21-image</base.image.name>
+        <base.image.version>2.2-STAGING-latest</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.2</ccsdk.distribution.version>
+        <ccsdk.distribution.version>2.2.0-SNAPSHOT</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>
@@ -294,7 +294,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
                 <configuration>
                     <environmentVariables>
                         <SDNC_CONFIG_DIR>${basedir}/src/test/resources</SDNC_CONFIG_DIR>
@@ -507,6 +506,7 @@
                                                     <MYSQL_USER>sli</MYSQL_USER>
                                                     <MYSQL_PASSWORD>abc123</MYSQL_PASSWORD>
                                                     <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                                    <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
                                                     <MYSQL_HOST>dbhost</MYSQL_HOST>
                                                     <SDNC_CONFIG_DIR>/opt/onap/ccsdk/config</SDNC_CONFIG_DIR>
                                                 </env>

diff --git a/ms/sliboot/src/main/resources/startSliboot.sh b/ms/sliboot/src/main/resources/startSliboot.sh
index 7341b41..797a936 100644 (file)
--- 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 98c6e09..e8d9284 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-30-starter-parent</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.0</version>
         <relativePath/>
     </parent>