Uplift xjc plugins, change javax -> jakarta, uplift gradle

.sdkmanrc

@@ -1,4 +1,4 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=17.0.8.1-tem
+java=21.0.3-tem
 

build.gradle

@@ -67,7 +67,7 @@ ext.getMajorVersion = { versionStr ->
 
 // Set this to the desired release version of the event-logging XML schema on github
 // *****************************************************************************
-def eventLoggingSchemaVer = "v4.0.0"
+def eventLoggingSchemaVer = "v4.0.2"
 // *****************************************************************************
 
 // Set this to the last release of this repo on this branch, or earlier branches
@@ -78,8 +78,8 @@ def eventLoggingSchemaVer = "v4.0.0"
 ext.previousReleaseVersion = "v5.0-beta.32_schema-v4.0-beta.10"
 // *****************************************************************************
 
-
 def VERSION_PATTERN = /^(?:v[0-9.]+(?:-(?:beta|alpha)[0-9.]+)?_)?schema-(v[0-9.]+(?:-(?:beta|alpha)[0-9.]+)?)(-SNAPSHOT)?$/
+
 def CHANGE_LOG_FILENAME = "CHANGELOG.md"
 def projectVersion = getPropertyOrDefault('version', "schema-${eventLoggingSchemaVer}-SNAPSHOT")
 def eventLoggingSchemaMajorVer = getMajorVersion(eventLoggingSchemaVer)
@@ -177,12 +177,13 @@ ext.libs = [
     jackson_databind               : "com.fasterxml.jackson.core:jackson-databind:2.13.3",
     jakarta_servlet_api            : "jakarta.servlet:jakarta.servlet-api:4.0.4",
     jakarta_ws_rs_api              : "jakarta.ws.rs:jakarta.ws.rs-api:2.1.6",
-    jaxb_api                       : "javax.xml.bind:jaxb-api", // Version set by jaxb_bom
-    jaxb_basics                    : "org.jvnet.jaxb2_commons:jaxb2-basics:0.12.0",
-    jaxb_rich_contract_plugin      : "net.codesup.util:jaxb2-rich-contract-plugin:2.1.0",
+    jaxb_api                       : "jakarta.xml.bind:jakarta.xml.bind-api", // Version set by jaxb_bom
+    //jaxb_basics                    : "org.jvnet.jaxb2_commons:jaxb2-basics:0.12.0",
+    jaxb_plugins                   : "org.jvnet.jaxb:jaxb-plugins:4.0.6",
+    jaxb_rich_contract_plugin      : "net.codesup.util:jaxb2-rich-contract-plugin:4.1.0",
     jaxb_runtime                   : "org.glassfish.jaxb:jaxb-runtime", // Version set by jaxb_bom
     jaxb_xjc                       : "org.glassfish.jaxb:jaxb-xjc", // Version set by jaxb_bom
-    jaxb_bom                       : "org.glassfish.jaxb:jaxb-bom:2.4.0-b180830.0438",
+    jaxb_bom                       : "org.glassfish.jaxb:jaxb-bom:4.0.5",
     junit_bom                      : "org.junit:junit-bom:5.10.0",
     junit_jupiter_api              : "org.junit.jupiter:junit-jupiter-api", // ver controlled by junit_bom
     junit_jupiter_engine           : "org.junit.jupiter:junit-jupiter-engine", // ver controlled by junit_bom
@@ -217,7 +218,7 @@ subprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(8)
+            languageVersion = JavaLanguageVersion.of(17)
             vendor = JvmVendorSpec.ADOPTIUM
         }
     }

event-logging-base/src/main/java/event/logging/base/impl/DefaultEventLoggingService.java

@@ -83,7 +83,7 @@ public DefaultEventLoggingService(ErrorHandler schemaValidationErrorHandler,
     public void log(final Event event) {
         final String data = eventSerializer.serialize(event);
         final String trimmed = data.trim();
-        if (trimmed.length() > 0) {
+        if (!trimmed.isEmpty()) {
             // Validate data here if the configuration option is set.
             if (checkValidating()) {
                 xmlValidator.validate(trimmed);
@@ -109,7 +109,7 @@ private boolean checkValidating() {
 
         // If we aren't setting validate on .
         final String val = System.getProperty(VALIDATE);
-        return Boolean.valueOf(val);
+        return Boolean.parseBoolean(val);
     }
 
     /**

event-logging-base/src/main/java/event/logging/base/impl/DefaultEventSerializer.java

@@ -16,11 +16,11 @@
 package event.logging.base.impl;
 
 import event.logging.Event;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
 
 import java.io.StringWriter;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
 
 public class DefaultEventSerializer implements EventSerializer {
     private static JAXBContext context;

event-logging-base/src/test/java/event/logging/base/Payload.java

@@ -15,8 +15,9 @@
  */
 package event.logging.base;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Payload")
 public class Payload {

event-logging-base/src/test/java/event/logging/base/impl/EventLoggingServiceIT.java

@@ -45,14 +45,14 @@
 import event.logging.base.Payload;
 import event.logging.util.DeviceUtil;
 import event.logging.util.EventLoggingUtil;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;

event-logging-base/src/test/java/event/logging/base/impl/FluentEventLoggingServiceIT.java

@@ -176,8 +176,11 @@ void testBasic() throws Exception {
         event.getEventDetail()
                 .setEventAction(AuthenticateEventAction.builder()
                         .withAction(AuthenticateAction.LOGON)
+                        .withData(Data.builder().withName("foo").withValue("bar").build())
                         .withUser(User.builder()
                                 .withId("user1")
+                                .withName("User 1")
+                                .withData(Data.builder().withName("id").withValue("user1").build())
                                 .build())
                         .build());
 
@@ -952,7 +955,7 @@ void testBuildLogger_simpleResult() {
                 .withTypeId("MyTypeId")
                 .withDescription("My description")
                 .withDefaultEventAction(SearchEventAction.builder()
-                       .build())
+                        .build())
                 .withSimpleLoggedResult(() -> {
                     // Do logged work
                     return 42L;
@@ -1036,10 +1039,10 @@ private EventLoggingService buildEventLoggingServiceSpy(final List<Event> events
 
         // Override the behaviour of the log() method so we can see what gets logged
         Mockito.doAnswer(invocation -> {
-            final Event event = invocation.getArgument(0, Event.class);
-            events.add(event);
-            return null;
-        })
+                    final Event event = invocation.getArgument(0, Event.class);
+                    events.add(event);
+                    return null;
+                })
                 .when(eventLoggingServiceSpy).log(Mockito.any());
         return eventLoggingServiceSpy;
     }

event-logging-generator/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 
     runtimeOnly libs.jaxb_runtime
     runtimeOnly libs.jaxb_rich_contract_plugin
-    runtimeOnly libs.jaxb_basics
+    runtimeOnly libs.jaxb_plugins
     runtimeOnly libs.saxon_he
 }
 

event-logging-generator/src/main/java/event/logging/gen/GenClasses.java

@@ -21,7 +21,11 @@
 import java.io.UncheckedIOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.*;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -68,6 +72,9 @@ public static void main(final String[] args) throws Exception {
 
     private void run() throws Exception {
 
+        System.setProperty("com.sun.tools.xjc.Options.findServices", "true");
+        System.setProperty("com.sun.tools.internal.xjc.Options.findServices", "true");
+
         Path rootDir = Paths.get(".").normalize().toAbsolutePath();
         if (rootDir.endsWith(GENERATOR_PROJECT_NAME)) {
             //running from within the generator module so go up one
@@ -132,7 +139,7 @@ private void processXSDFile(final Path rootDir) throws Exception {
                 "-quiet",
                 modXsd.toAbsolutePath().toString(), // the source schema to gen classes from
                 "-Xfluent-builder", // make builder classes/methods
-                "-generateJavadocFromAnnotations=true",
+                "-fluent-builder.generateJavadocFromAnnotations=true",
                 "-Xinheritance",
         };
 

example-logged-application/build.gradle

@@ -42,7 +42,7 @@ ext.versions = [
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
+        languageVersion = JavaLanguageVersion.of(17)
         vendor = JvmVendorSpec.ADOPTIUM
     }
 }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -55,7 +55,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/subprojects/plugins/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 +80,11 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,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,18 +198,28 @@ 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" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal