Upgrade to Java 21 and Jakarta EE 10.0

Author: allanmckenzie

CHANGELOG.md

@@ -5,6 +5,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [21.0.0-SNAPSHOT] - 2026-03-31
+### Changed
+- Upgraded to Java 21 and Jakarta EE 10
+- Migrated `javax.jms.*` to `jakarta.jms.*` in embedded Artemis and JMS test utility classes (`EmbeddedArtemisServerIT`, `MessageConsumerClient`, `MessageConsumerFactory`, `JmsSessionFactory`, `DeadLetterQueueBrowser`, `TopicSender`)
+- Replaced `javax.xml.bind:jaxb-api` with `jakarta.xml.bind:jakarta.xml.bind-api` in plugin dependencies
+- Removed test module 'embedded-artemis' and all associated code, in order to break the dependency on artemis
+- Upgraded OpenEJB from `8.0.13` to `10.0.0` (Jakarta EE 10 compatible) — fixes `@Resource` injection in Application Composer integration tests and removes the need for xbean-asm9 overrides as OpenEJB 10 natively supports Java 21 class files
+- Fixed `job-manager-it` integration tests (`JobSchedulerIT`, `JobServiceIT`): `@Resource(name = "openejb/Resource/jobStore")` injection now works correctly with OpenEJB 10 + `jakarta.annotation.Resource`
+- Fixed `HasEventsMatcherTest` `UnnecessaryStubbingException`: in `shouldReturnTrueIfAllExpectedEventsAreInTheActualEventList`, `event_3` only appears in `actualEvents` so `fieldNames()` is never called on it via `WildcardTextNodeSupport`; replaced `create("event_3")` with a plain `mock(JsonNode.class, "event_3")` for that node, and replaced `lenient()` stubbing in the `create()` helper with strict `when()` stubbing
+- Fixed Maven plugin scope warnings: added `<scope>provided</scope>` to `maven-plugin-api`, `maven-compat`, `maven-core`, and `maven-model` in `annotation-validator-maven-plugin`, `generator-plugin`, and `raml-maven-plugin`; added explicit `provided` declarations for `maven-plugin-api` and `maven-core` in `catalog-generation-plugin` and `pojo-generation-plugin`
+- Added `commons-lang3` as an explicit compile dependency to `generator-plugin` (previously pulled in transitively via `maven-core`)
+- Fixed `IntegerEnumDeserializer`: changed `super(enumResolver)` to `super(enumResolver, Boolean.FALSE)` — in Jackson 2.15.x the single-arg `EnumDeserializer(EnumResolver)` constructor internally passes `null` for `caseInsensitive` causing `NullPointerException` on unboxing
 
 # [17.105.0-M2] - 2026-02-26
 ### Added

annotation-validator/annotation-validator-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.justice.maven</groupId>
         <artifactId>annotation-validator</artifactId>
-        <version>17.105.0-M3-SNAPSHOT</version>
+        <version>21.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

annotation-validator/annotation-validator-maven-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.justice.maven</groupId>
         <artifactId>annotation-validator</artifactId>
-        <version>17.105.0-M3-SNAPSHOT</version>
+        <version>21.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,21 +28,25 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-compat</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -82,8 +86,18 @@
             <artifactId>annotation-validator-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
 
         <!-- Test dependencies -->
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>${jakarta.inject-api.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

annotation-validator/annotation-validator-maven-plugin/src/test/java/uk/gov/justice/plugin/validator/AnnotationValidatorFactoryTest.java

@@ -9,7 +9,7 @@
 import uk.gov.justice.plugin.domain.TestAnnotation;
 import uk.gov.justice.plugin.exception.ValidatorNotFoundException;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

annotation-validator/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>uk.gov.justice.framework.libraries</groupId>
         <artifactId>framework-libraries</artifactId>
-        <version>17.105.0-M3-SNAPSHOT</version>
+        <version>21.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.justice.maven</groupId>

domain-test-dsl/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>uk.gov.justice.framework.libraries</groupId>
         <artifactId>framework-libraries</artifactId>
-        <version>17.105.0-M3-SNAPSHOT</version>
+        <version>21.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.justice.services</groupId>
@@ -30,7 +30,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>2.22.2</version>
+                        <version>${plugins.maven.failsafe.version}</version>
                         <executions>
                             <execution>
                                 <goals>

domain-test-dsl/src/test/java/uk/gov/justice/services/test/AggregateMethodInvocationTest.java

@@ -10,7 +10,7 @@
 import uk.gov.justice.services.test.domain.aggregate.GenericAggregate;
 import uk.gov.justice.services.test.domain.arg.ComplexArgument;
 
-import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.UUID;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -85,7 +85,7 @@ public void shouldCallMethodWithDateTimeArgFromFile() throws Exception {
 
         assertMethodInvocations(aggregateWrapper, "doSthWithDateTimeArg", 1,
                 arrayContaining(ZonedDateTimes.fromString("2017-01-21T16:42:03.522Z")
-                        .withZoneSameInstant(ZoneId.of("UTC"))));
+                        .withZoneSameInstant(ZoneOffset.UTC)));
     }
 
     @Test

domain-test-dsl/src/test/java/uk/gov/justice/services/test/matchers/HasEventsMatcherTest.java

@@ -43,7 +43,7 @@ public void shouldReturnTrueIfAllExpectedEventsAreInTheActualEventList() throws
 
         final JsonNode event_1 = create("event_1");
         final JsonNode event_2 = create("event_2");
-        final JsonNode event_3 = create("event_3");
+        final JsonNode event_3 = mock(JsonNode.class, "event_3");
 
         final Description description = mock(Description.class);