#79 - Bump to Java 11 with module-info

rbygrave · rbygrave · commit 6d75fd8cf066 · 2022-05-23T22:47:59.000+12:00
diff --git a/http-api/pom.xml b/http-api/pom.xml
@@ -10,14 +10,6 @@
 
   <artifactId>avaje-http-api</artifactId>
 
-<!--  <groupId>io.avaje</groupId>-->
-<!--  <version>1.2</version>-->
-<!--  <parent>-->
-<!--    <groupId>org.avaje</groupId>-->
-<!--    <artifactId>java8-oss</artifactId>-->
-<!--    <version>2.3</version>-->
-<!--  </parent>-->
-
   <scm>
     <developerConnection>scm:git:git@github.com:avaje/avaje-http.git</developerConnection>
     <tag>HEAD</tag>
diff --git a/http-api/src/main/java/module-info.java b/http-api/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module io.avaje.http.api {
+
+  exports io.avaje.http.api;
+
+}
diff --git a/http-generator-client/pom.xml b/http-generator-client/pom.xml
@@ -32,8 +32,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.10.1</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
           <!-- Turn off annotation processing for building -->
           <compilerArgument>-proc:none</compilerArgument>
         </configuration>
diff --git a/http-generator-client/src/main/java/module-info.java b/http-generator-client/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module io.avaje.http.client.generator {
+
+  provides javax.annotation.processing.Processor with io.avaje.http.generator.client.ClientProcessor;
+
+  requires transitive io.avaje.http.generator.core;
+  requires java.compiler;
+}
diff --git a/http-generator-core/pom.xml b/http-generator-core/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <swagger.version>2.0.8</swagger.version>
-    <jackson.version>2.12.6.1</jackson.version>
+    <jackson.version>2.13.3</jackson.version>
   </properties>
 
   <dependencies>
@@ -63,8 +63,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.10.1</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
           <!-- Turn off annotation processing for building -->
           <compilerArgument>-proc:none</compilerArgument>
         </configuration>
diff --git a/http-generator-core/src/main/java/module-info.java b/http-generator-core/src/main/java/module-info.java
@@ -0,0 +1,15 @@
+module io.avaje.http.generator.core {
+
+  exports io.avaje.http.generator.core;
+  exports io.avaje.http.generator.core.javadoc;
+  exports io.avaje.http.generator.core.openapi;
+
+  requires java.sql;
+  requires java.compiler;
+  requires transitive io.avaje.http.api;
+  requires transitive io.swagger.v3.oas.models;
+  requires transitive io.swagger.v3.oas.annotations;
+  requires transitive com.fasterxml.jackson.core;
+  requires transitive com.fasterxml.jackson.databind;
+  requires transitive java.validation;
+}
diff --git a/http-generator-helidon/pom.xml b/http-generator-helidon/pom.xml
@@ -29,8 +29,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.10.1</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
           <!-- Turn off annotation processing for building -->
           <compilerArgument>-proc:none</compilerArgument>
         </configuration>
diff --git a/http-generator-javalin/pom.xml b/http-generator-javalin/pom.xml
@@ -29,8 +29,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.10.1</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
           <!-- Turn off annotation processing for building -->
           <compilerArgument>-proc:none</compilerArgument>
         </configuration>
diff --git a/http-generator-javalin/src/main/java/module-info.java b/http-generator-javalin/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module io.avaje.http.javalin.generator {
+
+  provides javax.annotation.processing.Processor with io.avaje.http.generator.javalin.JavalinProcessor;
+
+  requires transitive io.avaje.http.generator.core;
+  requires java.compiler;
+}
diff --git a/http-generator-jex/pom.xml b/http-generator-jex/pom.xml
@@ -29,8 +29,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.10.1</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
           <!-- Turn off annotation processing for building -->
           <compilerArgument>-proc:none</compilerArgument>
         </configuration>
diff --git a/http-generator-jex/src/main/java/module-info.java b/http-generator-jex/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module io.avaje.http.jex.generator {
+
+  provides javax.annotation.processing.Processor with io.avaje.http.generator.jex.JexProcessor;
+
+  requires transitive io.avaje.http.generator.core;
+  requires java.compiler;
+}
diff --git a/pom.xml b/pom.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.avaje</groupId>
+    <artifactId>java11-oss</artifactId>
+    <version>3.8</version>
+  </parent>
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-http-generator-parent</artifactId>
   <version>1.17-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>3.8</version>
-  </parent>
-
   <scm>
     <developerConnection>scm:git:git@github.com:avaje/avaje-http.git</developerConnection>
     <tag>HEAD</tag>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +module io.avaje.http.api {
++
 +  exports io.avaje.http.api;
++
 +}