upgrade to java 11

Issue-ID: DCAEGEN2-2330
Change-Id: I91d4cd75f1f70645d7fca6fb9555da48be8300ef
Signed-off-by: Schmalzried, Terry (ts862m) <ts862m@att.com>

diff --git a/README.md b/README.md
index 4128632..75f33a7 100644 (file)
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ java -jar dcae-service-change-handler-0.1.0.jar prod http://consul:8500/v1/kv/se
 
 #### Use script
 
-[`sch.sh`](resources/sch.sh) is a script to run service change handler that connects with inventory using HTTPS.  The script attempts to add a custom CA cert to the OS's key store `/etc/ssl/certs/java/cacerts` and then launches service change handler.  The custom CA cert is used to validate the server-side cert provided by inventory at runtime.
+[`sch.sh`](resources/sch.sh) is a script to run service change handler that connects with inventory using HTTPS.  The script attempts to add a custom CA cert to the OS's key store `/usr/local/openjdk-11/lib/security/cacerts` and then launches service change handler.  The custom CA cert is used to validate the server-side cert provided by inventory at runtime.
 
 The script uses the following environment variables:
 

diff --git a/pom.xml b/pom.xml
index ad73931..de016e3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ================================================================================
-Copyright (c) 2016-2019 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2016-2020 AT&T Intellectual Property. All rights reserved.
 ================================================================================
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
     <groupId>org.onap.dcaegen2.platform</groupId>
     <artifactId>servicechange-handler</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <!-- Not sure why clojure-maven-plugin says packaging should be "clojure" -->
     <packaging>jar</packaging>
 
@@ -144,10 +144,9 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -214,24 +213,21 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                 <artifactId>docker-maven-plugin</artifactId>
                 <version>1.0.0</version>
                 <configuration>
-                    <maintainer>Michael Hwang</maintainer>
+                    <maintainer>Terry Schmalzried</maintainer>
                     <imageName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId}</imageName>
                     <imageTags>
                         <imageTag>${project.version}-${maven.build.timestamp}Z</imageTag>
                         <imageTag>${project.version}</imageTag>
                         <imageTag>latest</imageTag>
                     </imageTags>
-                    <baseImage>openjdk:8-jre-alpine</baseImage>
-                    <user>sch</user>
+                    <baseImage>openjdk:11-jre-slim</baseImage>
+                    <user>onap</user>
                     <runs>
-                        <run>apk update</run>
-                        <run>apk add bash</run>
-                        <run>chmod 666 /etc/ssl/certs/java/cacerts</run>
-                        <run>addgroup -S sch</run>
-                        <run>adduser -S -G sch sch</run>
+                        <run>chmod 666 /usr/local/openjdk-11/lib/security/cacerts</run>
                     </runs>
                     <!-- NOTE: Couldn't figure out how to package the jar to be named: ${project.build.finalName}. This might be
                             because of the clojure maven plugin -->
+                    <entrypoint></entrypoint>
                     <cmd>["/opt/sch.sh"]</cmd>
                     <!-- copy the service's jar file from target into the root directory of the image -->
                     <resources>

diff --git a/resources/sch.sh b/resources/sch.sh
index 0a68858..05c8e97 100755 (executable)
--- a/resources/sch.sh
+++ b/resources/sch.sh
@@ -40,7 +40,7 @@ fi
 # Add the cacert to validate inventory's cert to support TLS.  This command is
 # allowed to fail when there is no need for https.
 # NOTE: This user must have permission to write to /etc/ssl/certs/java/cacerts
-keytool -importcert -file $PATH_TO_CACERT -keystore /etc/ssl/certs/java/cacerts -alias "inventory" -noprompt -storepass changeit
+keytool -importcert -file $PATH_TO_CACERT -keystore /usr/local/openjdk-11/lib/security/cacerts -alias "inventory" -noprompt -storepass changeit
 
 # Now launch SCH
 java -jar /opt/servicechange-handler.jar $SCH_ARGS

diff --git a/startSCH.sh b/startSCH.sh
index 951b1eb..3e74b3c 100644 (file)
--- a/startSCH.sh
+++ b/startSCH.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-grep "^nameserver" /opt/sch/etc/resolv.conf >> /etc/resolv.conf
+grep "^nameserver" /opt/onap/etc/resolv.conf >> /etc/resolv.conf
 
 service sendmail start
 
-java -Dlogback.configurationFile=logback.xml -jar /opt/sch/target/dcae-service-change-handler.jar prod http://consul:8500/v1/kv/service-change-handler?raw=true
+java -Dlogback.configurationFile=logback.xml -jar /opt/onap/target/dcae-service-change-handler.jar prod http://consul:8500/v1/kv/service-change-handler?raw=true
 

diff --git a/version.properties b/version.properties
index ef20baa..9e0d73d 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
-minor=3
-patch=2
+minor=4
+patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT