Move baseline to Java 17

Fixes #348, and some other minor issues as well
smallrye · Sep 27, 2024 · e5e7574 · e5e7574
1 parent 521ecdb
commit e5e7574
Show file tree

Hide file tree

Showing 40 changed files with 112 additions and 105 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,7 +40,6 @@ jobs:
         with:
           distribution: temurin
           java-version: |
-            11
             17
             21
           cache: 'maven'
@@ -49,7 +48,7 @@ jobs:
       - name: build with maven
         run: |
           mvn -q -N "io.takari:maven:${{env.IO_TAKARI_MAVEN_WRAPPER_VERSION}}:wrapper" "-Dmaven=${{env.MAVEN_VERSION}}"
-          ./mvnw -B -ntp formatter:validate verify --file pom.xml "-Dexpected-cpu=x64,aarch64" "-Djava11.home=${{env.JAVA_HOME_11_X64}}${{env.JAVA_HOME_11_ARM64}}" "-Djava17.home=${{env.JAVA_HOME_17_X64}}${{env.JAVA_HOME_17_ARM64}}"
+          ./mvnw -B -ntp formatter:validate verify --file pom.xml "-Dexpected-cpu=x64,aarch64" "-Djava17.home=${{env.JAVA_HOME_17_X64}}${{env.JAVA_HOME_17_ARM64}}"
 
   quality:
     needs: [ build ]

diff --git a/annotation/build-test-java11 → annotation/build-release-17 b/annotation/build-test-java11 → annotation/build-release-17
diff --git a/annotation/pom.xml b/annotation/pom.xml
@@ -17,17 +17,6 @@
       <groupId>jakarta.enterprise</groupId>
       <artifactId>jakarta.enterprise.cdi-api</artifactId>
       <scope>provided</scope>
-      <exclusions>
-        <!-- keep the dependency tree of this module as small as possible -->
-        <exclusion>
-          <groupId>jakarta.el</groupId>
-          <artifactId>jakarta.el-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jakarta.interceptor</groupId>
-          <artifactId>jakarta.interceptor-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
 
@@ -37,10 +26,6 @@
         <groupId>org.jboss.jandex</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>io.github.dmlloyd.module-info</groupId>
-        <artifactId>module-info</artifactId>
-      </plugin>
     </plugins>
   </build>
   <profiles>

diff --git a/annotation/src/main/java/module-info.java b/annotation/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module io.smallrye.common.annotation {
+    requires static jakarta.cdi;
+    requires static jakarta.inject;
+
+    exports io.smallrye.common.annotation;
+}
diff --git a/classloader/build-test-java11 → classloader/build-release-17 b/classloader/build-test-java11 → classloader/build-release-17
diff --git a/constraint/build-test-java11 → constraint/build-release-17 b/constraint/build-test-java11 → constraint/build-release-17
diff --git a/constraint/pom.xml b/constraint/pom.xml
@@ -16,27 +16,31 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.jboss.bridger</groupId>
                 <artifactId>bridger</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>org.jboss.logging</groupId>
+                            <artifactId>jboss-logging-processor</artifactId>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/constraint/src/main/java/module-info.java b/constraint/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module io.smallrye.common.constraint {
+    requires org.jboss.logging;
+    requires static org.jboss.logging.annotations;
+
+    exports io.smallrye.common.constraint;
+}
diff --git a/constraint/src/main/java/module-info.yml b/constraint/src/main/java/module-info.yml
diff --git a/cpu/build-test-java11 → cpu/build-release-17 b/cpu/build-test-java11 → cpu/build-release-17
diff --git a/cpu/pom.xml b/cpu/pom.xml
@@ -26,10 +26,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
-            </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>

diff --git a/cpu/src/main/java/module-info.java b/cpu/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module smallrye.common.cpu.main {
+    requires jdk.unsupported;
+
+    exports io.smallrye.common.cpu;
+}
diff --git a/expression/build-test-java11 → expression/build-release-17 b/expression/build-test-java11 → expression/build-release-17
diff --git a/expression/pom.xml b/expression/pom.xml
@@ -26,10 +26,6 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -39,8 +35,15 @@
     <build>
         <plugins>
             <plugin>
-              <groupId>io.github.dmlloyd.module-info</groupId>
-              <artifactId>module-info</artifactId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>org.jboss.logging</groupId>
+                            <artifactId>jboss-logging-processor</artifactId>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/expression/src/main/java/module-info.java b/expression/src/main/java/module-info.java
@@ -0,0 +1,8 @@
+module io.smallrye.common.expression {
+    requires io.smallrye.common.constraint;
+    requires io.smallrye.common.function;
+    requires org.jboss.logging;
+    requires static org.jboss.logging.annotations;
+
+    exports io.smallrye.common.expression;
+}
diff --git a/expression/src/main/java/module-info.yml b/expression/src/main/java/module-info.yml
diff --git a/function/build-test-java11 → function/build-release-17 b/function/build-test-java11 → function/build-release-17
diff --git a/function/pom.xml b/function/pom.xml
@@ -25,17 +25,20 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>org.jboss.logging</groupId>
+                            <artifactId>jboss-logging-processor</artifactId>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/function/src/main/java/module-info.java b/function/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module io.smallrye.common.function {
+    requires io.smallrye.common.constraint;
+    requires org.jboss.logging;
+    requires static org.jboss.logging.annotations;
+
+    exports io.smallrye.common.function;
+}
diff --git a/function/src/main/java/module-info.yml b/function/src/main/java/module-info.yml
diff --git a/io/build-test-java11 → io/build-release-17 b/io/build-test-java11 → io/build-release-17
diff --git a/net/build-test-java11 → net/build-release-17 b/net/build-test-java11 → net/build-release-17
diff --git a/net/pom.xml b/net/pom.xml
@@ -29,10 +29,6 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -43,8 +39,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>org.jboss.logging</groupId>
+                            <artifactId>jboss-logging-processor</artifactId>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/net/src/main/java/module-info.java b/net/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module io.smallrye.common.net {
+    requires io.smallrye.common.constraint;
+    requires org.jboss.logging;
+    requires static org.graalvm.nativeimage;
+    requires static org.graalvm.word;
+    requires static org.jboss.logging.annotations;
+
+    exports io.smallrye.common.net;
+}
diff --git a/net/src/main/java/module-info.yml b/net/src/main/java/module-info.yml
diff --git a/os/build-test-java11 → os/build-release-17 b/os/build-test-java11 → os/build-release-17
diff --git a/ref/build-test-java11 → ref/build-release-17 b/ref/build-test-java11 → ref/build-release-17
diff --git a/ref/pom.xml b/ref/pom.xml
@@ -23,15 +23,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
             <id>coverage</id>

diff --git a/ref/src/main/java/module-info.java b/ref/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module io.smallrye.common.ref {
+    requires io.smallrye.common.constraint;
+    requires static org.graalvm.nativeimage;
+
+    exports io.smallrye.common.ref;
+}
diff --git a/ref/src/main/java/module-info.yml b/ref/src/main/java/module-info.yml
diff --git a/resource/src/main/java/module-info.java b/resource/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module io.smallrye.common.resource {
+    requires io.smallrye.common.constraint;
+
+    exports io.smallrye.common.resource;
+}
diff --git a/resource/src/main/java/module-info.yml b/resource/src/main/java/module-info.yml
diff --git a/version/build-test-java11 → version/build-release-17 b/version/build-test-java11 → version/build-release-17
diff --git a/version/pom.xml b/version/pom.xml
@@ -22,11 +22,6 @@
             <artifactId>jboss-logging-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
@@ -57,8 +52,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>org.jboss.logging</groupId>
+                            <artifactId>jboss-logging-processor</artifactId>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/version/src/main/java/module-info.java b/version/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module io.smallrye.common.version {
+    requires io.smallrye.common.constraint;
+    requires org.jboss.logging;
+    requires static org.jboss.logging.annotations;
+
+    exports io.smallrye.common.version;
+}
diff --git a/version/src/main/java/module-info.yml b/version/src/main/java/module-info.yml
diff --git a/vertx-context/build-test-java11 → vertx-context/build-release-17 b/vertx-context/build-test-java11 → vertx-context/build-release-17
diff --git a/vertx-context/pom.xml b/vertx-context/pom.xml
@@ -42,10 +42,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.jboss.jandex</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>

diff --git a/vertx-context/src/main/java/module-info.java b/vertx-context/src/main/java/module-info.java
@@ -0,0 +1,4 @@
+module io.smallrye.common.vertx {
+    requires io.smallrye.common.constraint;
+    requires io.vertx.core;
+}
diff --git a/vertx-context/src/main/java/module-info.yml b/vertx-context/src/main/java/module-info.yml