From bb9d95fe1920330cf2ee49c45c7b66652ba4d239 Mon Sep 17 00:00:00 2001
From: Leonardo Zanivan <panga@apache.org>
Date: Tue, 24 Jul 2018 18:00:44 -0300
Subject: [PATCH] Migrate to JDK 11

---
 pom.xml                           | 44 +++++++++++++++++++------------
 src/main/docker/Dockerfile        |  2 +-
 src/main/docker/Dockerfile.fatjar |  2 +-
 src/main/docker/Dockerfile.glibc  | 11 +++++---
 src/main/docker/Dockerfile.musl   | 11 +++++---
 src/main/java/module-info.java    |  2 ++
 6 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index fcc0a7ed21e..66e44e95eda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,9 @@
   <properties>
 
     <!-- Generic properties -->
-    <java.version>10</java.version>
+    <java.version>11</java.version>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -114,21 +116,10 @@
       <optional>true</optional>
     </dependency>
 
-      <dependency>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-          <version>2.3.0</version>
-      </dependency>
       <dependency>
           <groupId>org.glassfish.jaxb</groupId>
           <artifactId>jaxb-runtime</artifactId>
-          <version>2.3.0</version>
-          <scope>runtime</scope>
-      </dependency>
-      <dependency>
-          <groupId>javax.activation</groupId>
-          <artifactId>javax.activation-api</artifactId>
-          <version>1.2.0</version>
+          <version>2.4.0-b180608.0325</version>
       </dependency>
       <dependency>
           <groupId>org.hibernate.javax.persistence</groupId>
@@ -140,6 +131,17 @@
           <artifactId>jboss-transaction-api_1.2_spec</artifactId>
           <version>1.1.1.Final</version>
       </dependency>
+      <dependency>
+          <groupId>org.javassist</groupId>
+          <artifactId>javassist</artifactId>
+          <version>3.23.1-GA</version>
+      </dependency>
+      <dependency>
+          <groupId>org.mockito</groupId>
+          <artifactId>mockito-core</artifactId>
+          <version>2.20.0</version>
+          <scope>test</scope>
+      </dependency>
   </dependencies>
 
   <build>
@@ -155,7 +157,7 @@
                 <dependency>
                     <groupId>org.ow2.asm</groupId>
                     <artifactId>asm</artifactId>
-                    <version>6.1.1</version>
+                    <version>6.2</version>
                 </dependency>
             </dependencies>
         </plugin>
@@ -169,7 +171,7 @@
                 <dependency>
                     <groupId>org.ow2.asm</groupId>
                     <artifactId>asm</artifactId>
-                    <version>6.1.1</version>
+                    <version>6.2</version>
                 </dependency>
             </dependencies>
         </plugin>
@@ -186,7 +188,7 @@
                     <configuration>
                         <outputDirectory>${project.build.directory}/modules</outputDirectory>
                         <includeScope>runtime</includeScope>
-                        <excludeArtifactIds>spring-boot-devtools,jaxb-api,jaxb-core,jaxb-runtime</excludeArtifactIds>
+                        <excludeArtifactIds>spring-boot-devtools</excludeArtifactIds>
                     </configuration>
                 </execution>
             </executions>
@@ -270,7 +272,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>2.18.0</version>
+                <version>2.20.0</version>
             </dependency>
         </dependencies>
       </plugin>
@@ -383,4 +385,12 @@
     </license>
   </licenses>
 
+    <repositories>
+        <repository>
+            <id>jvnet-nexus-staging</id>
+            <url>http://maven.java.net/content/repositories/staging/</url>
+            <layout>default</layout>
+        </repository>
+    </repositories>
+
 </project>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 07f0db50d2a..858e13a0ba1 120000
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1 +1 @@
-Dockerfile.glibc
\ No newline at end of file
+Dockerfile.musl
\ No newline at end of file
diff --git a/src/main/docker/Dockerfile.fatjar b/src/main/docker/Dockerfile.fatjar
index 19cad6cc69d..b54fa3b4a6b 100644
--- a/src/main/docker/Dockerfile.fatjar
+++ b/src/main/docker/Dockerfile.fatjar
@@ -1,4 +1,4 @@
-FROM openjdk:10.0.1-jre-slim
+FROM openjdk:11-jre-slim
 
 ADD spring-petclinic-2.0.0.BUILD-SNAPSHOT.jar app.jar
 
diff --git a/src/main/docker/Dockerfile.glibc b/src/main/docker/Dockerfile.glibc
index 87e29c2c632..c69f640784e 100644
--- a/src/main/docker/Dockerfile.glibc
+++ b/src/main/docker/Dockerfile.glibc
@@ -1,7 +1,7 @@
-FROM openjdk:10.0.1 as builder
+FROM openjdk:11 as builder
 
 RUN jlink \
-    --add-modules java.xml.bind,java.sql,java.naming,java.management,java.instrument,java.security.jgss \
+    --add-modules java.sql,java.naming,java.management,java.instrument,java.security.jgss,java.desktop,jdk.unsupported \
     --verbose \
     --strip-debug \
     --compress 2 \
@@ -9,7 +9,7 @@ RUN jlink \
     --no-man-pages \
     --output /opt/jre-minimal
 
-FROM panga/alpine:3.7-glibc2.25
+FROM panga/alpine:3.8-glibc2.27
 
 COPY --from=builder /opt/jre-minimal /opt/jre-minimal
 
@@ -21,4 +21,7 @@ ADD modules /opt/app/modules
 ARG JVM_OPTS
 ENV JVM_OPTS=${JVM_OPTS}
 
-CMD java ${JVM_OPTS} --upgrade-module-path /opt/app/modules --module spring.petclinic
+CMD java ${JVM_OPTS} \
+    --add-opens java.base/java.lang=spring.core,javassist \
+    --module-path /opt/app/modules \
+    --module spring.petclinic
diff --git a/src/main/docker/Dockerfile.musl b/src/main/docker/Dockerfile.musl
index 86b3485f857..6b3b5b363bf 100644
--- a/src/main/docker/Dockerfile.musl
+++ b/src/main/docker/Dockerfile.musl
@@ -1,7 +1,7 @@
-FROM panga/openjdk10:jdk-alpine as builder
+FROM panga/openjdk-alpine:11-jdk as builder
 
 RUN jlink \
-    --add-modules java.xml.bind,java.sql,java.naming,java.management,java.instrument,java.security.jgss \
+    --add-modules java.sql,java.naming,java.management,java.instrument,java.security.jgss,java.desktop,jdk.unsupported \
     --verbose \
     --strip-debug \
     --compress 2 \
@@ -9,7 +9,7 @@ RUN jlink \
     --no-man-pages \
     --output /opt/jre-minimal
 
-FROM alpine:3.7
+FROM alpine:3.8
 
 COPY --from=builder /opt/jre-minimal /opt/jre-minimal
 
@@ -21,4 +21,7 @@ ADD modules /opt/app/modules
 ARG JVM_OPTS
 ENV JVM_OPTS=${JVM_OPTS}
 
-CMD java ${JVM_OPTS} --upgrade-module-path /opt/app/modules --module spring.petclinic
+CMD java ${JVM_OPTS} \
+    --add-opens java.base/java.lang=spring.core,javassist \
+    --module-path /opt/app/modules \
+    --module spring.petclinic
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 857b1e00293..ecc9e996452 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -21,4 +21,6 @@
     requires spring.tx;
     requires spring.web;
     requires spring.webmvc;
+
+    requires jdk.unsupported;
 }