From 51cdc697d7384bb33c3c11e377943681c8e4de0e Mon Sep 17 00:00:00 2001 From: "mukesh.paliwal1@huawei.com" Date: Thu, 13 Aug 2020 15:12:27 +0530 Subject: Upgrade java version from 8 to 11 Issue-ID: SO-3082 Signed-off-by: mukesh.paliwal1@huawei.com Change-Id: I54965e03c0674be799d78be9ede1ac2dd7dc131a --- .../Deployment/Dockerfile.adapters | 2 +- .../test/java/org/onap/so/client/HttpClientTest.java | 8 ++++---- .../main/docker/docker-files/Dockerfile.so-base-image | 2 +- .../docker/docker-files/Dockerfile.so-nssmf-adapter | 2 +- pom.xml | 17 +++++++++++------ so-monitoring/pom.xml | 4 ++-- so-monitoring/so-monitoring-handler/pom.xml | 2 +- so-simulator/src/main/docker/Dockerfile | 2 +- 8 files changed, 22 insertions(+), 17 deletions(-) diff --git a/adapters/mso-openstack-adapters/Deployment/Dockerfile.adapters b/adapters/mso-openstack-adapters/Deployment/Dockerfile.adapters index 4d3e36ed9c..2c04ea221f 100644 --- a/adapters/mso-openstack-adapters/Deployment/Dockerfile.adapters +++ b/adapters/mso-openstack-adapters/Deployment/Dockerfile.adapters @@ -1,4 +1,4 @@ -FROM openjdk:8-jdk-alpine +FROM onap/integration-java11:7.0.0 MAINTAINER mc4615@att.com EXPOSE 8080 ENV APP_HOME /home/$USER_NAME/app diff --git a/common/src/test/java/org/onap/so/client/HttpClientTest.java b/common/src/test/java/org/onap/so/client/HttpClientTest.java index a01e2bb812..e9e8fe7853 100644 --- a/common/src/test/java/org/onap/so/client/HttpClientTest.java +++ b/common/src/test/java/org/onap/so/client/HttpClientTest.java @@ -40,7 +40,7 @@ public class HttpClientTest { private final HttpClientFactory httpClientFactory = new HttpClientFactory(); @Rule - public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicHttpsPort()); + public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort().dynamicHttpsPort()); @Test public void testPost_success() throws MalformedURLException { @@ -48,7 +48,7 @@ public class HttpClientTest { wireMockRule.stubFor(post(urlEqualTo("/services/sdnc/post")) .willReturn(aResponse().withStatus(200).withHeader("Content-Type", "application/json").withBody(""))); - URL url = new URL("http://localhost:" + wireMockConfig().portNumber() + "/services/sdnc/post"); + URL url = new URL("http://localhost:" + wireMockRule.port() + "/services/sdnc/post"); HttpClient client = httpClientFactory.newJsonClient(url, ONAPComponents.BPMN); client.addBasicAuthHeader( @@ -67,7 +67,7 @@ public class HttpClientTest { wireMockRule.stubFor(post(urlEqualTo("/services/sdnc/post")) .willReturn(aResponse().withStatus(200).withHeader("Content-Type", "application/json").withBody(""))); - URL url = new URL("http://localhost:" + wireMockConfig().portNumber() + "/services/sdnc/post"); + URL url = new URL("http://localhost:" + wireMockRule.port() + "/services/sdnc/post"); HttpClient client = httpClientFactory.newJsonClient(url, ONAPComponents.BPMN); client.addAdditionalHeader("Accept", "application/json"); @@ -85,7 +85,7 @@ public class HttpClientTest { wireMockRule.stubFor(post(urlEqualTo("/services/sdnc/post")) .willReturn(aResponse().withStatus(200).withHeader("Content-Type", "application/json").withBody(""))); - URL url = new URL("http://localhost:" + wireMockConfig().portNumber() + "/services/sdnc/post"); + URL url = new URL("http://localhost:" + wireMockRule.port() + "/services/sdnc/post"); HttpClient client = httpClientFactory.newJsonClient(url, ONAPComponents.BPMN); client.addBasicAuthHeader("", "12345"); diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image index e3eb954e1e..db57688dc1 100644 --- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image @@ -1,4 +1,4 @@ -FROM docker.io/openjdk:8-jdk-alpine +FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine ARG http_proxy ARG https_proxy diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter b/packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter index ef82da4a12..19368fb597 100644 --- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter @@ -12,7 +12,7 @@ RUN mkdir -p /app/config RUN mkdir -p /app/certificates RUN mkdir -p /app/logs RUN mkdir -p /app/ca-certificates -RUN apk update && apk add apache2-utils -y +RUN apk update && apk add apache2-utils COPY maven/app.jar /app COPY configs/logging/logback-spring.xml /app diff --git a/pom.xml b/pom.xml index 45f60783b3..2341f772af 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,7 @@ UTF-8 UTF-8 java + 11 jacoco ${project.build.directory}/surefire-reports ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml @@ -242,6 +243,10 @@ -parameters + true + ${java.version} + ${java.version} + ${java.version} @@ -916,7 +921,7 @@ org.yaml snakeyaml - 1.23 + 1.26 javax.interceptor @@ -1005,8 +1010,8 @@ 3.8.0 true - 1.8 - 1.8 + ${java.version} + ${java.version} @@ -1028,9 +1033,9 @@ 3.8.0 true - 11 - 11 - 11 + ${java.version} + ${java.version} + ${java.version} diff --git a/so-monitoring/pom.xml b/so-monitoring/pom.xml index f2448ab2b2..e93de40262 100644 --- a/so-monitoring/pom.xml +++ b/so-monitoring/pom.xml @@ -34,8 +34,8 @@ ${project.artifactId} - 1.8 - 1.8 + 11 + 11 UTF-8 UTF-8 diff --git a/so-monitoring/so-monitoring-handler/pom.xml b/so-monitoring/so-monitoring-handler/pom.xml index f591a079e3..626f9f7352 100644 --- a/so-monitoring/so-monitoring-handler/pom.xml +++ b/so-monitoring/so-monitoring-handler/pom.xml @@ -79,7 +79,7 @@ nl.jqno.equalsverifier equalsverifier - 2.5.1 + 3.4.1 test diff --git a/so-simulator/src/main/docker/Dockerfile b/so-simulator/src/main/docker/Dockerfile index 8fa8dc75e9..2fab854f34 100644 --- a/so-simulator/src/main/docker/Dockerfile +++ b/so-simulator/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/openjdk:8-jdk-alpine +FROM docker.io/openjdk:11-jre-slim #Create User so RUN addgroup -g 1000 so && adduser -S -u 1000 -G so so -- cgit