From c9278775191988fd4600efc8826b5d4dcff7f2b3 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 7 Jul 2021 10:14:06 +0200
Subject: [PATCH] OZG-222 upgrade java 11 -> 16; upgrade keycloak 13.0.1 ->
14.0.0, "fix" lombok problem with java 16
---
goofy-server/Dockerfile | 6 ++----
goofy-server/pom.xml | 14 +++++++++++++-
pom.xml | 5 +++--
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/goofy-server/Dockerfile b/goofy-server/Dockerfile
index b9653d2ded..d0ab194942 100644
--- a/goofy-server/Dockerfile
+++ b/goofy-server/Dockerfile
@@ -1,8 +1,6 @@
-#FROM 172.30.35.192:8082/openjdk:11-slim
-FROM openjdk:11-slim
+FROM openjdk:16-alpine
-#COPY ${JAR_FILE} /opt/goofy.jar
COPY /target/goofy-server.jar /opt/goofy.jar
WORKDIR /opt
-CMD java -jar goofy.jar
+CMD java -jar goofy.jar
\ No newline at end of file
diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml
index cbc33fb946..04caeddcc7 100644
--- a/goofy-server/pom.xml
+++ b/goofy-server/pom.xml
@@ -174,11 +174,12 @@
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
+ <fork>true</fork>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.16</version>
+ <version>${lombok.version}</version>
</path>
<path>
<groupId>org.mapstruct</groupId>
@@ -196,9 +197,20 @@
<compilerArg>
-Amapstruct.unmappedTargetPolicy=ERROR
</compilerArg>
+ <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+ <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+ <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+ <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+ <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+ <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+ <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+ <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+ <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+ <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED</arg>
</compilerArgs>
</configuration>
</plugin>
+
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 62b748a8c6..7c07e706ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>11</java.version>
+ <java.version>16</java.version>
<pluto.version>${project.version}</pluto.version>
@@ -27,7 +27,8 @@
<spring-admin.version>2.3.1</spring-admin.version>
<mapstruct.version>1.4.1.Final</mapstruct.version>
<commons-io.version>2.8.0</commons-io.version>
- <keycloak-adapter.version>13.0.1</keycloak-adapter.version>
+ <keycloak-adapter.version>14.0.0</keycloak-adapter.version>
+ <lombok.version>1.18.20</lombok.version>
<lorem.version>2.1</lorem.version>
--
GitLab