From fa02f313699683aff20bd99ee2416a64a850a81f Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 14 Sep 2020 13:11:15 -0400
Subject: Update sdnc/apps to use java11 base image

Update sdnc/apps to use Java 11 base image

Change-Id: I10468121df75931ad1687400457c0e95cd5113ae
Issue-ID: SDNC-1242
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 ms/generic-resource-api/pom.xml                    | 16 ++++++++++------
 ms/generic-resource-api/src/main/docker/Dockerfile |  6 +++---
 ms/pom.xml                                         |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'ms')

diff --git a/ms/generic-resource-api/pom.xml b/ms/generic-resource-api/pom.xml
index 6f0d4e5..c3b95aa 100644
--- a/ms/generic-resource-api/pom.xml
+++ b/ms/generic-resource-api/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
     </parent>
 
     <groupId>org.onap.sdnc.apps</groupId>
     <artifactId>generic-resource-api</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sdnc-apps :: ms :: ${project.artifactId}</name>
@@ -22,11 +22,11 @@
         <shiro.version>1.5.0</shiro.version>
         <aaf-shiro-bundle.version>2.1.13</aaf-shiro-bundle.version>
         <ccsdk.apps.version>1.0.0</ccsdk.apps.version>
-        <ccsdk.docker.version>1.0.0-STAGING-latest</ccsdk.docker.version>
-        <sdnc.northbound.version>2.0.0</sdnc.northbound.version>
-        <sdnc.oam.version>2.0.0</sdnc.oam.version>
+        <ccsdk.docker.version>1.0-STAGING-latest</ccsdk.docker.version>
+        <sdnc.northbound.version>2.0.1</sdnc.northbound.version>
+        <sdnc.oam.version>2.0.1</sdnc.oam.version>
 
-        <base.image.name>onap/ccsdk-alpine-image</base.image.name>
+        <base.image.name>onap/ccsdk-alpine-j11-image</base.image.name>
         <image.name>onap/sdnc-gra-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
@@ -75,6 +75,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+          </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
diff --git a/ms/generic-resource-api/src/main/docker/Dockerfile b/ms/generic-resource-api/src/main/docker/Dockerfile
index b4038c4..79dda69 100644
--- a/ms/generic-resource-api/src/main/docker/Dockerfile
+++ b/ms/generic-resource-api/src/main/docker/Dockerfile
@@ -2,9 +2,8 @@
 ## START OF STAGE0 ##
 FROM @base.image.name@:@ccsdk.docker.version@ AS stage0
 
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
 ENV LOG_PATH /var/log/onap/sdnc
-
+USER root
 
 # copy deliverables to opt
 COPY opt /opt
@@ -17,7 +16,6 @@ FROM @base.image.name@:@ccsdk.docker.version@
 MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
 
 ENV PROJECT_VERSION @project.version@
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
 ENV SDNC_HOME /opt/onap/sdnc
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/config
 ENV GRA_JAR @sdnc.gra.jar@
@@ -25,6 +23,8 @@ ENV SVCLOGIC_PROPERTIES /opt/onap/sdnc/config/svclogic.properties
 ENV SVCLOGIC_DIR /opt/onap/sdnc/svclogic/graphs
 ENV LOG_PATH /var/log/onap/sdnc
 
+USER root
+
 # Install sudo and IP utilities
 RUN apk update && apk --no-cache add sudo iputils openssl
 
diff --git a/ms/pom.xml b/ms/pom.xml
index 0984713..c5cf9df 100644
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.sdnc.apps</groupId>
         <artifactId>sdnc-apps</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>sdnc-apps-ms</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Micro-services Root</name>
-- 
cgit 1.2.3-korg