From 71a1743a76c08eac60e0eee6ea94275d0a677877 Mon Sep 17 00:00:00 2001
From: Leonardo Zanivan <panga@apache.org>
Date: Thu, 17 May 2018 18:26:48 -0300
Subject: [PATCH] Migrate to JDK 10 with module system

---
 pom.xml                        | 160 +++++++++++++++++++++++++--------
 src/main/java/module-info.java |  23 +++++
 2 files changed, 148 insertions(+), 35 deletions(-)
 create mode 100644 src/main/java/module-info.java

diff --git a/pom.xml b/pom.xml
index 0b8f9c273..1bd466802 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
   <properties>
 
     <!-- Generic properties -->
-    <java.version>1.8</java.version>
+    <java.version>10</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -27,8 +27,7 @@
     <webjars-jquery.version>2.2.4</webjars-jquery.version>
     <wro4j.version>1.8.0</wro4j.version>
 
-    <cobertura.version>2.7</cobertura.version>
-
+    <spring.version>5.0.6.RELEASE</spring.version>
   </properties>
 
   <dependencies>
@@ -44,6 +43,12 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
+        <exclusions>
+            <exclusion>
+                <artifactId>javax.transaction-api</artifactId>
+                <groupId>javax.transaction</groupId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -108,10 +113,91 @@
       <artifactId>spring-boot-devtools</artifactId>
       <scope>runtime</scope>
     </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>
+      </dependency>
+      <dependency>
+          <groupId>org.hibernate.javax.persistence</groupId>
+          <artifactId>hibernate-jpa-2.1-api</artifactId>
+          <version>1.0.2.Final</version>
+      </dependency>
+      <dependency>
+          <groupId>org.jboss.spec.javax.transaction</groupId>
+          <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+          <version>1.1.1.Final</version>
+      </dependency>
   </dependencies>
 
   <build>
     <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.7.0</version>
+            <configuration>
+                <release>${java.version}</release>
+            </configuration>
+            <dependencies>
+                <dependency>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm</artifactId>
+                    <version>6.1.1</version>
+                </dependency>
+            </dependencies>
+        </plugin>
+        <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.21.0</version>
+            <configuration>
+                <forkCount>0</forkCount>
+            </configuration>
+            <dependencies>
+                <dependency>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm</artifactId>
+                    <version>6.1.1</version>
+                </dependency>
+            </dependencies>
+        </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>3.1.0</version>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <goals>
+                        <goal>copy-dependencies</goal>
+                    </goals>
+                    <configuration>
+                        <outputDirectory>${project.build.directory}/modules</outputDirectory>
+                        <includeScope>runtime</includeScope>
+                        <excludeArtifactIds>spring-boot-devtools,jaxb-api,jaxb-core,jaxb-runtime</excludeArtifactIds>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
+        <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <version>3.1.0</version>
+            <configuration>
+                <outputDirectory>${project.build.directory}/modules</outputDirectory>
+            </configuration>
+        </plugin>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
@@ -133,22 +219,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>${cobertura.version}</version>
-        <configuration>
-          <check />
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>clean</goal>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
 
       <!-- Spring Boot Actuator displays build-related information if a git.properties
         file is present at the classpath -->
@@ -197,26 +267,46 @@
             <artifactId>bootstrap</artifactId>
             <version>${webjars-bootstrap.version}</version>
           </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>2.18.0</version>
+            </dependency>
         </dependencies>
       </plugin>
+        <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.6.0</version>
+            <executions>
+                <execution>
+                    <id>module-main-class</id>
+                    <phase>package</phase>
+                    <goals>
+                        <goal>exec</goal>
+                    </goals>
+                    <configuration>
+                        <executable>jar</executable>
+                        <arguments>
+                            <argument>
+                                --update
+                            </argument>
+                            <argument>
+                                --file=${project.build.directory}/modules/${project.build.finalName}.jar
+                            </argument>
+                            <argument>
+                                --main-class=org.springframework.samples.petclinic.PetClinicApplication
+                            </argument>
+                            <argument>
+                                --module-version=${project.version}
+                            </argument>
+                        </arguments>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
     </plugins>
   </build>
-  <reporting>
-    <plugins>
-      <!-- integrate maven-cobertura-plugin to project site -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>${cobertura.version}</version>
-        <configuration>
-          <formats>
-            <format>html</format>
-          </formats>
-          <check />
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
 
   <!-- Apache 2 license -->
   <licenses>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 000000000..ced7c47fa
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,23 @@
+open module spring.petclinic {
+    requires cache.api;
+
+    requires java.activation;
+    requires java.persistence;
+    requires java.sql;
+    requires java.transaction;
+    requires java.validation;
+    requires java.xml.bind;
+
+    requires org.hibernate.validator;
+
+    requires spring.beans;
+    requires spring.boot;
+    requires spring.boot.autoconfigure;
+    requires spring.context;
+    requires spring.core;
+    requires spring.data.commons;
+    requires spring.data.jpa;
+    requires spring.tx;
+    requires spring.web;
+    requires spring.webmvc;
+}