[java-modules] Upgrades

java-modules/README.md

@@ -21,18 +21,18 @@ I've found this to be helpful while learning about JPMS.
 
 Follow these instructions to build and run the demo program:
 
-1. Use Java 17
+1. Pre-requisite: Java 21
 2. Build and run the program:
    * ```shell
      ./gradlew run
      ```
    * It should print something that looks like the following.
    * ```text
      > Task :runner:run
-     [main] INFO dgroomes.runner.Main - You say: hello!
-     [main] INFO dgroomes.runner.Main - You heard: hello!, hello!, hello! ...
-     [main] INFO dgroomes.runner.Main - You say: { "message": "hello from JSON!" }
-     [main] INFO dgroomes.runner.Main - You heard: hello from JSON!, hello from JSON!, hello from JSON! ...
+     [main] INFO dgroomes.java_modules.runner.Main - You say: hello!
+     [main] INFO dgroomes.java_modules.runner.Main - You heard: hello!, hello!, hello! ...
+     [main] INFO dgroomes.java_modules.runner.Main - You say: { "message": "hello from JSON!" }
+     [main] INFO dgroomes.java_modules.runner.Main - You heard: hello from JSON!, hello from JSON!, hello from JSON! ...
      ```
 
 

java-modules/buildSrc/src/main/kotlin/common.gradle.kts

@@ -4,12 +4,6 @@ plugins {
     java
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
-}
-
 repositories {
     mavenCentral()
 }

java-modules/echo/src/main/java/dgroomes/echo/Echo.java → java-modules/echo/src/main/java/dgroomes/java_modules/echo/Echo.java

@@ -1,7 +1,7 @@
-package dgroomes.echo;
+package dgroomes.java_modules.echo;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import dgroomes.echo.impl.Util;
+import dgroomes.java_modules.echo.impl.Util;
 
 public class Echo {
 

java-modules/echo/src/main/java/dgroomes/echo/impl/Util.java → java-modules/echo/src/main/java/dgroomes/java_modules/echo/impl/Util.java

@@ -1,12 +1,12 @@
-package dgroomes.echo.impl;
+package dgroomes.java_modules.echo.impl;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * Note: this class is an implementation detail of the "echo" module and should not be exported. It should be invisible
- * to modules that import the "dgroomes.echo" module. This is a benefit of the Java Module System!
+ * to modules that import the "dgroomes.java_modules.echo" module. This is a benefit of the Java Module System!
  */
 public class Util {
 

java-modules/echo/src/main/java/module-info.java

@@ -1,8 +1,8 @@
-module dgroomes.echo {
+module dgroomes.java_modules.echo {
     requires com.fasterxml.jackson.databind;
 
-    // Export only the exact "dgroomes.echo" package. Notice how we don't export the package "dgroomes.echo.impl". This
-    // means other code that imports the "dgroomes.echo" module will only see the dgroomes.echo.Echo class and will not
-    // see the dgroomes.echo.impl.Util class. The Java Module System offers strong encapsulation!
-    exports dgroomes.echo;
+    // Export only the exact "dgroomes.java_modules.echo" package. Notice how we don't export the package "dgroomes.java_modules.echo.impl".
+    // This means other code that imports the "dgroomes.java_modules.echo" module will only see the "dgroomes.java_modules.echo.Echo"
+    // class and will not see the "dgroomes.echo.java_modules.impl.Util class". The Java Module System offers strong encapsulation!
+    exports dgroomes.java_modules.echo;
 }

java-modules/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

java-modules/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# 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"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +134,29 @@ 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.
 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=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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.
+
+# 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, 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" \

java-modules/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -26,6 +28,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -42,11 +45,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
 
@@ -56,11 +59,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
 

java-modules/runner/build.gradle.kts

@@ -10,6 +10,6 @@ dependencies {
 }
 
 application {
-    mainModule.set("dgroomes.runner")
-    mainClass.set("dgroomes.runner.Main")
+    mainModule.set("dgroomes.java_modules.runner")
+    mainClass.set("dgroomes.java_modules.runner.Main")
 }

java-modules/runner/src/main/java/dgroomes/runner/Main.java → java-modules/runner/src/main/java/dgroomes/java_modules/runner/Main.java

@@ -1,6 +1,6 @@
-package dgroomes.runner;
+package dgroomes.java_modules.runner;
 
-import dgroomes.echo.Echo;
+import dgroomes.java_modules.echo.Echo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

java-modules/runner/src/main/java/module-info.java

@@ -1,4 +1,4 @@
-module dgroomes.runner {
+module dgroomes.java_modules.runner {
     requires org.slf4j;
-    requires dgroomes.echo;
+    requires dgroomes.java_modules.echo;
 }