update to OpenJDK 21, Gradle 8.7

build.gradle

@@ -1,12 +1,7 @@
 plugins {
-    //id "checkstyle"
-    //id "pmd"
     id 'maven-publish'
     id 'signing'
-    id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
-    //id "com.github.spotbugs" version "5.0.14"
-    id "org.cyclonedx.bom" version "1.7.2"
-    //id "org.xbib.gradle.plugin.asciidoctor" version "3.0.0"
+    id "io.github.gradle-nexus.publish-plugin" version "2.0.0-rc-1"
 }
 
 wrapper {
@@ -30,22 +25,17 @@ ext {
 }
 
 apply plugin: 'java-library'
-apply from: rootProject.file('gradle/init/banner.gradle')
-apply from: rootProject.file('gradle/ide/idea.gradle')
+
 apply from: rootProject.file('gradle/repositories/maven.gradle')
 apply from: rootProject.file('gradle/compile/java.gradle')
 apply from: rootProject.file('gradle/test/junit5.gradle')
-apply from: rootProject.file('gradle/quality/cyclonedx.gradle')
-//apply from: rootProject.file('gradle/quality/spotbugs.gradle')
-//apply from: rootProject.file('gradle/quality/checkstyle.gradle')
-//apply from: rootProject.file('gradle/quality/pmd.gradle')
 apply from: rootProject.file('gradle/publish/sonatype.gradle')
 apply from: rootProject.file('gradle/publish/forgejo.gradle')
 
 dependencies {
     api libs.javax.inject
     api libs.guava
-    testImplementation libs.junit4
+    testImplementation testLibs.junit4
     // Helper for com.google.common.testing.GcFinalization, com.google.common.testing.EqualsTester
-    testImplementation libs.guava.testlib
+    testImplementation testLibs.guava.testlib
 }

gradle.properties

@@ -1,5 +1,3 @@
 group = org.xbib
 name = guice
-version = 5.0.1.0
-
-org.gradle.warning.mode = ALL
+version = 5.0.1.1

gradle/compile/java.gradle

@@ -2,21 +2,14 @@
 apply plugin: 'java-library'
 
 java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
     modularity.inferModulePath.set(true)
     withSourcesJar()
     withJavadocJar()
 }
 
-compileJava {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-compileTestJava {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
 jar {
     manifest {
         attributes('Implementation-Version': project.version)
@@ -24,10 +17,14 @@ jar {
 }
 
 tasks.withType(JavaCompile) {
-    options.encoding('UTF-8')
-    options.compilerArgs << '-Xlint:all'
+    options.fork = true
+    options.forkOptions.jvmArgs += ['-Duser.language=en','-Duser.country=US']
+    options.compilerArgs.add('-Xlint:-requires-transitive-automatic')
+    options.compilerArgs.add('-Xlint:deprecation')
+    options.encoding = 'UTF-8'
 }
 
-javadoc {
+tasks.withType(Javadoc) {
     options.addStringOption('Xdoclint:none', '-quiet')
+    options.encoding = 'UTF-8'
 }

gradle/test/junit5.gradle

@@ -1,18 +1,19 @@
-
-def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.7.1'
-def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
-
 dependencies {
-    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
-    testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
-    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
+    testImplementation testLibs.junit.jupiter.api
+    testImplementation testLibs.hamcrest
+    testRuntimeOnly testLibs.junit.jupiter.engine
 }
 
 test {
     useJUnitPlatform()
-    failFast = false
+    doFirst {
+        jvmArgs = [
+                '--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED',
+                '--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED',
+                '--add-opens=java.base/java.nio=ALL-UNNAMED'
+        ]
+    }
+    failFast = true
     testLogging {
         events 'STARTED', 'PASSED', 'FAILED', 'SKIPPED'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

settings.gradle

@@ -15,35 +15,18 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
-            version('gradle', '8.1.1')
-            version('groovy', '3.0.10')
-            version('junit', '5.9.2')
+            version('gradle', '8.7')
+            library('javax.inject', 'org.xbib', 'javax-inject').version('1')
+            library('guava', 'org.xbib', 'guava').version('30.2')
+        }
+        testLibs {
+            version('junit', '5.10.2')
             library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
             library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
             library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
             library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
             library('junit4', 'junit', 'junit').version('4.13.2')
-            library('javax.inject', 'org.xbib', 'javax-inject').version('1')
-            library('guava', 'org.xbib', 'guava').version('30.1')
             library('guava.testlib', 'com.google.guava', 'guava-testlib').version('30.1-jre')
         }
     }
 }
-
-/*
-gradle.wrapper.version = 6.6.1
-javax-inject.version = 1
-guava.version = 30.1
-# test
-junit.version = 5.7.2
-junit4.version = 4.13.2
-log4j.version = 2.14.1
-
-    api "org.xbib:javax-inject:${project.property('javax-inject.version')}"
-    api "org.xbib:guava:${project.property('guava.version')}"
-    testImplementation "junit:junit:${project.property('junit4.version')}"
-    // Helper for com.google.common.testing.GcFinalization, com.google.common.testing.EqualsTester
-    testImplementation "com.google.guava:guava-testlib:30.1-jre"
-
-
- */

src/main/java/com/google/inject/internal/InternalInjectorCreator.java

@@ -67,8 +67,7 @@ public final class InternalInjectorCreator {
 
     /**
      * Sets the parent of the injector to-be-constructed. As a side effect, this sets this injector's
-     * stage to the stage of {@code parent} and sets {@link #requireExplicitBindings()} if the parent
-     * injector also required them.
+     * stage to the stage of {@code parent}.
      */
     public InternalInjectorCreator parentInjector(InjectorImpl parent) {
         shellBuilder.parent(parent);

src/main/java/com/google/inject/util/Modules.java

@@ -407,7 +407,7 @@ public final class Modules {
     }
 
     /**
-     * Returns a module that will configure the injector to require {@literal @}{@link Inject} on
+     * Returns a module that will configure the injector to require {@code Inject} on
      * constructors.
      *
      * @see Binder#requireAtInjectOnConstructors