From e5e757456e0be961d78e39eff3a310fd924dfe7a Mon Sep 17 00:00:00 2001 From: "David M. Lloyd" Date: Fri, 27 Sep 2024 10:47:10 -0500 Subject: [PATCH] Move baseline to Java 17 Fixes #348, and some other minor issues as well --- .github/workflows/build.yml | 3 +-- .../{build-test-java11 => build-release-17} | 0 annotation/pom.xml | 15 -------------- annotation/src/main/java/module-info.java | 6 ++++++ .../{build-test-java11 => build-release-17} | 0 .../{build-test-java11 => build-release-17} | 0 constraint/pom.xml | 20 +++++++++++-------- constraint/src/main/java/module-info.java | 6 ++++++ constraint/src/main/java/module-info.yml | 4 ---- cpu/{build-test-java11 => build-release-17} | 0 cpu/pom.xml | 4 ---- cpu/src/main/java/module-info.java | 5 +++++ .../{build-test-java11 => build-release-17} | 0 expression/pom.xml | 15 ++++++++------ expression/src/main/java/module-info.java | 8 ++++++++ expression/src/main/java/module-info.yml | 6 ------ .../{build-test-java11 => build-release-17} | 0 function/pom.xml | 15 ++++++++------ function/src/main/java/module-info.java | 7 +++++++ function/src/main/java/module-info.yml | 4 ---- io/{build-test-java11 => build-release-17} | 0 net/{build-test-java11 => build-release-17} | 0 net/pom.xml | 15 ++++++++------ net/src/main/java/module-info.java | 9 +++++++++ net/src/main/java/module-info.yml | 5 ----- os/{build-test-java11 => build-release-17} | 0 ref/{build-test-java11 => build-release-17} | 0 ref/pom.xml | 9 --------- ref/src/main/java/module-info.java | 6 ++++++ ref/src/main/java/module-info.yml | 4 ---- resource/src/main/java/module-info.java | 5 +++++ resource/src/main/java/module-info.yml | 4 ---- .../{build-test-java11 => build-release-17} | 0 version/pom.xml | 16 ++++++++------- version/src/main/java/module-info.java | 7 +++++++ version/src/main/java/module-info.yml | 5 ----- .../{build-test-java11 => build-release-17} | 0 vertx-context/pom.xml | 4 ---- vertx-context/src/main/java/module-info.java | 4 ++++ vertx-context/src/main/java/module-info.yml | 6 ------ 40 files changed, 112 insertions(+), 105 deletions(-) rename annotation/{build-test-java11 => build-release-17} (100%) create mode 100644 annotation/src/main/java/module-info.java rename classloader/{build-test-java11 => build-release-17} (100%) rename constraint/{build-test-java11 => build-release-17} (100%) create mode 100644 constraint/src/main/java/module-info.java delete mode 100644 constraint/src/main/java/module-info.yml rename cpu/{build-test-java11 => build-release-17} (100%) create mode 100644 cpu/src/main/java/module-info.java rename expression/{build-test-java11 => build-release-17} (100%) create mode 100644 expression/src/main/java/module-info.java delete mode 100644 expression/src/main/java/module-info.yml rename function/{build-test-java11 => build-release-17} (100%) create mode 100644 function/src/main/java/module-info.java delete mode 100644 function/src/main/java/module-info.yml rename io/{build-test-java11 => build-release-17} (100%) rename net/{build-test-java11 => build-release-17} (100%) create mode 100644 net/src/main/java/module-info.java delete mode 100644 net/src/main/java/module-info.yml rename os/{build-test-java11 => build-release-17} (100%) rename ref/{build-test-java11 => build-release-17} (100%) create mode 100644 ref/src/main/java/module-info.java delete mode 100644 ref/src/main/java/module-info.yml create mode 100644 resource/src/main/java/module-info.java delete mode 100644 resource/src/main/java/module-info.yml rename version/{build-test-java11 => build-release-17} (100%) create mode 100644 version/src/main/java/module-info.java delete mode 100644 version/src/main/java/module-info.yml rename vertx-context/{build-test-java11 => build-release-17} (100%) create mode 100644 vertx-context/src/main/java/module-info.java delete mode 100644 vertx-context/src/main/java/module-info.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ccdc211..c402b1f2 100644 --- 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 b/annotation/build-release-17 similarity index 100% rename from annotation/build-test-java11 rename to annotation/build-release-17 diff --git a/annotation/pom.xml b/annotation/pom.xml index 1904656d..06bd2531 100644 --- a/annotation/pom.xml +++ b/annotation/pom.xml @@ -17,17 +17,6 @@ jakarta.enterprise jakarta.enterprise.cdi-api provided - - - - jakarta.el - jakarta.el-api - - - jakarta.interceptor - jakarta.interceptor-api - - @@ -37,10 +26,6 @@ org.jboss.jandex jandex-maven-plugin - - io.github.dmlloyd.module-info - module-info - diff --git a/annotation/src/main/java/module-info.java b/annotation/src/main/java/module-info.java new file mode 100644 index 00000000..290baaea --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/classloader/build-test-java11 b/classloader/build-release-17 similarity index 100% rename from classloader/build-test-java11 rename to classloader/build-release-17 diff --git a/constraint/build-test-java11 b/constraint/build-release-17 similarity index 100% rename from constraint/build-test-java11 rename to constraint/build-release-17 diff --git a/constraint/pom.xml b/constraint/pom.xml index 6e0e6a63..766da9e1 100644 --- a/constraint/pom.xml +++ b/constraint/pom.xml @@ -16,27 +16,31 @@ org.jboss.logging jboss-logging + compile org.jboss.logging jboss-logging-annotations - - org.jboss.logging - jboss-logging-processor - - - io.github.dmlloyd.module-info - module-info - org.jboss.bridger bridger + + maven-compiler-plugin + + + + org.jboss.logging + jboss-logging-processor + + + + diff --git a/constraint/src/main/java/module-info.java b/constraint/src/main/java/module-info.java new file mode 100644 index 00000000..fc551223 --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/constraint/src/main/java/module-info.yml b/constraint/src/main/java/module-info.yml deleted file mode 100644 index 60ed0993..00000000 --- a/constraint/src/main/java/module-info.yml +++ /dev/null @@ -1,4 +0,0 @@ -name: io.smallrye.common.constraint - -requires: - - module: org.jboss.logging diff --git a/cpu/build-test-java11 b/cpu/build-release-17 similarity index 100% rename from cpu/build-test-java11 rename to cpu/build-release-17 diff --git a/cpu/pom.xml b/cpu/pom.xml index b09f29bb..599694f2 100644 --- a/cpu/pom.xml +++ b/cpu/pom.xml @@ -26,10 +26,6 @@ - - io.github.dmlloyd.module-info - module-info - maven-surefire-plugin diff --git a/cpu/src/main/java/module-info.java b/cpu/src/main/java/module-info.java new file mode 100644 index 00000000..2bb166de --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/expression/build-test-java11 b/expression/build-release-17 similarity index 100% rename from expression/build-test-java11 rename to expression/build-release-17 diff --git a/expression/pom.xml b/expression/pom.xml index bb4dc624..1a9796e6 100644 --- a/expression/pom.xml +++ b/expression/pom.xml @@ -26,10 +26,6 @@ org.jboss.logging jboss-logging-annotations - - org.jboss.logging - jboss-logging-processor - org.junit.jupiter junit-jupiter @@ -39,8 +35,15 @@ - io.github.dmlloyd.module-info - module-info + maven-compiler-plugin + + + + org.jboss.logging + jboss-logging-processor + + + diff --git a/expression/src/main/java/module-info.java b/expression/src/main/java/module-info.java new file mode 100644 index 00000000..bf7abc73 --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/expression/src/main/java/module-info.yml b/expression/src/main/java/module-info.yml deleted file mode 100644 index 0559552f..00000000 --- a/expression/src/main/java/module-info.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: io.smallrye.common.expression - -requires: - - module: io.smallrye.common.constraint - - module: io.smallrye.common.function - - module: org.jboss.logging diff --git a/function/build-test-java11 b/function/build-release-17 similarity index 100% rename from function/build-test-java11 rename to function/build-release-17 diff --git a/function/pom.xml b/function/pom.xml index 97dc94d4..b47f84ba 100644 --- a/function/pom.xml +++ b/function/pom.xml @@ -25,17 +25,20 @@ org.jboss.logging jboss-logging-annotations - - org.jboss.logging - jboss-logging-processor - - io.github.dmlloyd.module-info - module-info + maven-compiler-plugin + + + + org.jboss.logging + jboss-logging-processor + + + diff --git a/function/src/main/java/module-info.java b/function/src/main/java/module-info.java new file mode 100644 index 00000000..a9ca3510 --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/function/src/main/java/module-info.yml b/function/src/main/java/module-info.yml deleted file mode 100644 index c0d74412..00000000 --- a/function/src/main/java/module-info.yml +++ /dev/null @@ -1,4 +0,0 @@ -name: io.smallrye.common.function - -requires: - - module: io.smallrye.common.constraint \ No newline at end of file diff --git a/io/build-test-java11 b/io/build-release-17 similarity index 100% rename from io/build-test-java11 rename to io/build-release-17 diff --git a/net/build-test-java11 b/net/build-release-17 similarity index 100% rename from net/build-test-java11 rename to net/build-release-17 diff --git a/net/pom.xml b/net/pom.xml index e857dad3..6e2e6555 100644 --- a/net/pom.xml +++ b/net/pom.xml @@ -29,10 +29,6 @@ org.jboss.logging jboss-logging-annotations - - org.jboss.logging - jboss-logging-processor - org.junit.jupiter junit-jupiter @@ -43,8 +39,15 @@ - io.github.dmlloyd.module-info - module-info + maven-compiler-plugin + + + + org.jboss.logging + jboss-logging-processor + + + diff --git a/net/src/main/java/module-info.java b/net/src/main/java/module-info.java new file mode 100644 index 00000000..066398e8 --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/net/src/main/java/module-info.yml b/net/src/main/java/module-info.yml deleted file mode 100644 index bb27ec53..00000000 --- a/net/src/main/java/module-info.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: io.smallrye.common.net - -requires: - - module: io.smallrye.common.constraint - - module: org.jboss.logging diff --git a/os/build-test-java11 b/os/build-release-17 similarity index 100% rename from os/build-test-java11 rename to os/build-release-17 diff --git a/ref/build-test-java11 b/ref/build-release-17 similarity index 100% rename from ref/build-test-java11 rename to ref/build-release-17 diff --git a/ref/pom.xml b/ref/pom.xml index 22225a2a..5bbe47a0 100644 --- a/ref/pom.xml +++ b/ref/pom.xml @@ -23,15 +23,6 @@ - - - - io.github.dmlloyd.module-info - module-info - - - - coverage diff --git a/ref/src/main/java/module-info.java b/ref/src/main/java/module-info.java new file mode 100644 index 00000000..2f633856 --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/ref/src/main/java/module-info.yml b/ref/src/main/java/module-info.yml deleted file mode 100644 index 1ef1191c..00000000 --- a/ref/src/main/java/module-info.yml +++ /dev/null @@ -1,4 +0,0 @@ -name: io.smallrye.common.ref - -requires: - - module: io.smallrye.common.constraint diff --git a/resource/src/main/java/module-info.java b/resource/src/main/java/module-info.java new file mode 100644 index 00000000..1c14fd24 --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/resource/src/main/java/module-info.yml b/resource/src/main/java/module-info.yml deleted file mode 100644 index 78a0aee7..00000000 --- a/resource/src/main/java/module-info.yml +++ /dev/null @@ -1,4 +0,0 @@ -name: io.smallrye.common.resource - -requires: - - module: io.smallrye.common.constraint diff --git a/version/build-test-java11 b/version/build-release-17 similarity index 100% rename from version/build-test-java11 rename to version/build-release-17 diff --git a/version/pom.xml b/version/pom.xml index 415a4933..4d7a318c 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -22,11 +22,6 @@ jboss-logging-annotations provided - - org.jboss.logging - jboss-logging-processor - provided - org.jboss.logging jboss-logging @@ -57,8 +52,15 @@ - io.github.dmlloyd.module-info - module-info + maven-compiler-plugin + + + + org.jboss.logging + jboss-logging-processor + + + diff --git a/version/src/main/java/module-info.java b/version/src/main/java/module-info.java new file mode 100644 index 00000000..c230bb83 --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/version/src/main/java/module-info.yml b/version/src/main/java/module-info.yml deleted file mode 100644 index b915c8cf..00000000 --- a/version/src/main/java/module-info.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: io.smallrye.common.version - -requires: - - module: io.smallrye.common.constraint - - module: org.jboss.logging diff --git a/vertx-context/build-test-java11 b/vertx-context/build-release-17 similarity index 100% rename from vertx-context/build-test-java11 rename to vertx-context/build-release-17 diff --git a/vertx-context/pom.xml b/vertx-context/pom.xml index 4ea837ab..3b34688a 100644 --- a/vertx-context/pom.xml +++ b/vertx-context/pom.xml @@ -42,10 +42,6 @@ - - io.github.dmlloyd.module-info - module-info - org.jboss.jandex jandex-maven-plugin diff --git a/vertx-context/src/main/java/module-info.java b/vertx-context/src/main/java/module-info.java new file mode 100644 index 00000000..485f6370 --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/vertx-context/src/main/java/module-info.yml b/vertx-context/src/main/java/module-info.yml deleted file mode 100644 index 2bfcdefd..00000000 --- a/vertx-context/src/main/java/module-info.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: io.smallrye.common.vertx - -requires: - - module: io.smallrye.common.constraint - - module: io.vertx.core - - module: org.jboss.logging