changes for java 11 upgradation

Issue-ID: SO-3082

Signed-off-by: arun chapagain <arun.chapagain@huawei.com>
Change-Id: Icb14f1a29d06d828307f0acc23d4414fecbbfaa3

diff --git a/adapters/mso-openstack-adapters/Deployment/Dockerfile.adapters b/adapters/mso-openstack-adapters/Deployment/Dockerfile.adapters
index 4d3e36e..8bc2ea6 100644 (file)
--- 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
@@ -37,4 +37,4 @@ ENTRYPOINT ["java","-jar","-Dspring.profiles.active=dev","mso-openstack-adapters
 # OR for interactive mode (-it), run the following command
 # docker run -it --net=mso_network -p 8080:8080 --name mchan mercechan/msoadapters
 # COMMANDS ########
-######### README #########
\ No newline at end of file
+######### README #########

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 a01e2bb..e9e8fe7 100644 (file)
--- 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 e3eb954..bf4a2fe 100644 (file)
--- 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 docker.io/onap/integration-java11:7.0.0
 
 ARG http_proxy
 ARG https_proxy

diff --git a/pom.xml b/pom.xml
index 68559c9..fbb5bee 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <sonar.language>java</sonar.language>
+    <java.version>11</java.version>
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
     <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
@@ -329,7 +330,7 @@
         <version>4.20</version>
         <configuration>
           <buildId>mso-${project.version}</buildId>
-          <source>1.8</source>
+          <source>${java.version}</source>
         </configuration>
       </plugin>
       <plugin>
@@ -1004,8 +1005,8 @@
             <version>3.8.0</version>
             <configuration>
               <forceJavacCompilerUse>true</forceJavacCompilerUse>
-              <source>1.8</source>
-              <target>1.8</target>
+              <source>${java.version}</source>
+              <target>${java.version}</target>
             </configuration>
           </plugin>
         </plugins>

diff --git a/so-monitoring/pom.xml b/so-monitoring/pom.xml
index 206a0f2..a86ffb2 100644 (file)
--- a/so-monitoring/pom.xml
+++ b/so-monitoring/pom.xml
@@ -34,8 +34,8 @@
   <name>${project.artifactId}</name>
 
   <properties>
-    <java.version>1.8</java.version>
-    <version.java.compiler>1.8</version.java.compiler>
+    <java.version>11</java.version>
+    <version.java.compiler>11</version.java.compiler>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>

diff --git a/so-monitoring/so-monitoring-handler/pom.xml b/so-monitoring/so-monitoring-handler/pom.xml
index 68f8c89..f3dabc3 100644 (file)
--- a/so-monitoring/so-monitoring-handler/pom.xml
+++ b/so-monitoring/so-monitoring-handler/pom.xml
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>nl.jqno.equalsverifier</groupId>
       <artifactId>equalsverifier</artifactId>
-      <version>2.5.1</version>
+      <version>3.4.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/so-monitoring/so-monitoring-ui/pom.xml b/so-monitoring/so-monitoring-ui/pom.xml
index 6488c7d..0ef608a 100644 (file)
--- a/so-monitoring/so-monitoring-ui/pom.xml
+++ b/so-monitoring/so-monitoring-ui/pom.xml
@@ -49,7 +49,7 @@
             </goals>
             <phase>generate-resources</phase>
             <configuration>
-              <nodeVersion>v10.8.0</nodeVersion>
+              <nodeVersion>v10.15.3</nodeVersion>
               <yarnVersion>v1.7.0</yarnVersion>
             </configuration>
           </execution>

diff --git a/so-simulator/src/main/docker/Dockerfile b/so-simulator/src/main/docker/Dockerfile
index 8fa8dc7..a64ec39 100644 (file)
--- 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
@@ -21,4 +21,4 @@ RUN chown -R so:so /app
 USER so 
 
 
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app/app.jar"]