Upgrade to Java 21 and Jakarta EE 10.0

.gitignore

@@ -60,3 +60,7 @@ buildContexts.sh
 lightning-jenkins.properties
 **/.DS_Store
 
+# OpenJPA bytecode enhancement artifacts (extracted from JAR by Maven enhance goal)
+/META-INF/
+/org/
+

jboss-deployment-structure.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="urn:jboss:deployment-structure:1.2 http://www.jboss.org/schema/jbossas/jboss-deployment-structure-1_2.xsd">
+    <deployment/>
+</jboss-deployment-structure>

pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>17.103.3</version>
+        <version>21.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.prosecution.casefile</groupId>
     <artifactId>prosecutioncasefile-parent</artifactId>
-    <version>17.0.89-SNAPSHOT</version>
+    <version>21.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Prosecution Casefile Microservice - Parent</name>
     <description>Casefile Microservice - Prosecution Context</description>
@@ -23,26 +23,25 @@
         <mvn.site.url>file://${project.build.directory}/site</mvn.site.url>
         <cpp.framework.action.mapping.enabled>true</cpp.framework.action.mapping.enabled>
         <authorisation.service.version>0.1.49</authorisation.service.version>
-        <coredomain.version>17.103.12</coredomain.version>
+        <coredomain.version>21.0.0-SNAPSHOT</coredomain.version>
         <cpp.structure.version>2.0.335</cpp.structure.version>
-        <system.users.library.version>3.1.3</system.users.library.version>
         <referencedata.version>17.103.131</referencedata.version>
         <referencedata.offences.version>17.0.38</referencedata.offences.version>
-        <system.enterprise-id.version>0.0.3</system.enterprise-id.version>
+        <system.enterprise-id.version>0.0.4-SNAPSHOT</system.enterprise-id.version>
         <resulting.version>17.0.37</resulting.version>
-        <progression.version>17.0.246</progression.version>
+        <progression.version>17.0.249</progression.version>
         <defence.version>17.0.85</defence.version>
         <criminal-court-public-model.version>${coredomain.version}</criminal-court-public-model.version>
         <notification.notify.version>17.0.24</notification.notify.version>
         <commons-text.version>1.10.0</commons-text.version>
         <awaility.version>1.7.0</awaility.version>
         <sjp.version>17.103.166</sjp.version>
-        <json-smart.version>2.4.8</json-smart.version>
-        <byte-buddy.version>1.12.19</byte-buddy.version>
+        <json-smart.version>2.4.9</json-smart.version>
+        <byte-buddy.version>1.18.8</byte-buddy.version>
         <domain.dsl.test.version>0.3.1</domain.dsl.test.version>
         <material.version>17.0.70</material.version>
         <stream-transformation-tool.version>6.4.5</stream-transformation-tool.version>
-        <json-smart.version>2.4.8</json-smart.version>
+        <json-smart.version>2.4.9</json-smart.version>
         <stream-transformation-tool-anonymise>7.0.0</stream-transformation-tool-anonymise>
         <sonar.coverage.exclusions>
             **/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/**/*
@@ -57,17 +56,11 @@
             **/uk/gov/moj/cps/prosecutioncasefile/command/handler/**/*
             **/uk/gov/moj/cpp/cps/prosecutioncasefile/command/handler/staging/**/*
             **/uk/gov/moj/cps/prosecutioncasefile/domain/event/**/*
-            **/uk/gov/moj/cpp/prosecution/casefile/event/**/*
         </sonar.coverage.exclusions>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>uk.gov.moj.cpp.common</groupId>
-                <artifactId>system-users-library</artifactId>
-                <version>${system.users.library.version}</version>
-            </dependency>
             <dependency>
                 <groupId>uk.gov.moj.cpp.system.enterpriseid</groupId>
                 <artifactId>system-enterprise-id</artifactId>
@@ -110,17 +103,6 @@
                 <artifactId>stream-transformation-tool-api</artifactId>
                 <version>${stream-transformation-tool.version}</version>
             </dependency>
-            <dependency>
-                <groupId>uk.gov.justice</groupId>
-                <artifactId>stream-transformation-tool-api</artifactId>
-                <version>${stream-transformation-tool.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>uk.gov.moj.cpp.core.domain</groupId>
-                <artifactId>common-core-domain</artifactId>
-                <version>${coredomain.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>com.jayway.awaitility</groupId>
                 <artifactId>awaitility</artifactId>

prosecutioncasefile-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.prosecution.casefile</groupId>
         <artifactId>prosecutioncasefile-parent</artifactId>
-        <version>17.0.89-SNAPSHOT</version>
+        <version>21.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

prosecutioncasefile-command/prosecutioncasefile-command-api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.prosecution.casefile</groupId>
         <artifactId>prosecutioncasefile-command</artifactId>
-        <version>17.0.89-SNAPSHOT</version>
+        <version>21.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,8 +17,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -95,6 +95,11 @@
             <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -170,8 +175,8 @@
                         </exclusions>
                     </dependency>
                     <dependency>
-                        <groupId>javax</groupId>
-                        <artifactId>javaee-api</artifactId>
+                        <groupId>jakarta.platform</groupId>
+                        <artifactId>jakarta.jakartaee-api</artifactId>
                         <version>${javaee-api.version}</version>
                     </dependency>
                     <dependency>

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/AddMaterialApi.java

@@ -18,12 +18,12 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import javax.inject.Inject;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.inject.Inject;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
 @ServiceComponent(COMMAND_API)
 public class AddMaterialApi {

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateCCProsecutionApi.java

@@ -50,7 +50,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @SuppressWarnings({"java:S126", "java:S1541"})
 @ServiceComponent(COMMAND_API)

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateGroupProsecutionApi.java

@@ -37,7 +37,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateSjpProsecutionApi.java

@@ -36,8 +36,8 @@
 import java.util.List;
 import java.util.UUID;
 
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 @ServiceComponent(COMMAND_API)
 public class InitiateSjpProsecutionApi {

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/PleadOnlineApi.java

@@ -2,7 +2,7 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Objects.nonNull;
-import static javax.json.Json.createObjectBuilder;
+import static jakarta.json.Json.createObjectBuilder;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.core.enveloper.Enveloper.envelop;
 import static uk.gov.justice.services.messaging.Envelope.envelopeFrom;
@@ -28,10 +28,10 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.inject.Inject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
 @ServiceComponent(COMMAND_API)
 public class PleadOnlineApi {

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/ResolveErrorsApi.java

@@ -10,7 +10,7 @@
 import uk.gov.justice.services.messaging.JsonEnvelope;
 import uk.gov.justice.services.messaging.Metadata;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @ServiceComponent(COMMAND_API)
 public class ResolveErrorsApi {

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SjpProsecutionUpdateOffenceCodeApi.java

@@ -15,9 +15,9 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.inject.Inject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
 
 import com.google.common.collect.Lists;
 

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SubmitCCApplicationApi.java

@@ -5,7 +5,7 @@
 import static java.util.Optional.ofNullable;
 import static java.util.UUID.randomUUID;
 import static java.util.stream.Collectors.toList;
-import static javax.json.Json.createObjectBuilder;
+import static jakarta.json.Json.createObjectBuilder;
 import static org.apache.commons.collections.CollectionUtils.isEmpty;
 import static org.slf4j.LoggerFactory.getLogger;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
@@ -38,8 +38,8 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import javax.inject.Inject;
-import javax.json.JsonObject;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/AddressService.java

@@ -5,8 +5,8 @@
 import static org.apache.commons.lang3.StringUtils.SPACE;
 import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter;
 
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
 public class AddressService {
 

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/CaseDetailsEnrichmentService.java

@@ -5,7 +5,7 @@
 
 import java.util.Optional;
 import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class CaseDetailsEnrichmentService {
     @Inject

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/IdGenerationService.java

@@ -16,7 +16,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.commons.text.RandomStringGenerator;
 

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/validator/PleadOnlineValidator.java

@@ -7,7 +7,6 @@
 import static java.util.Collections.singletonMap;
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
-import static org.drools.core.util.StringUtils.isEmpty;
 import static uk.gov.moj.cpp.prosecution.casefile.plea.json.schemas.CaseStatus.COMPLETED;
 import static uk.gov.moj.cpp.prosecution.casefile.plea.json.schemas.CaseStatus.REFERRED_FOR_COURT_HEARING;
 
@@ -26,7 +25,7 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 
 public class PleadOnlineValidator {
 
@@ -69,7 +68,7 @@ private static boolean hasEmptyFinancialMeans(final FinancialMeans financialMean
         return financialMeans == null ||
                 financialMeans.getBenefits() == null ||
                 financialMeans.getIncome() == null ||
-                isEmpty(financialMeans.getEmploymentStatus());
+                (financialMeans.getEmploymentStatus() == null || financialMeans.getEmploymentStatus().isEmpty());
     }
 
     private static boolean hasEmptyLegalEntityFinancialMeans(final LegalEntityFinancialMeans financialMeans) {

prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/resources/META-INF/beans.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-       version="1.1" bean-discovery-mode="all">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0" bean-discovery-mode="all">
 </beans>

prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/AddMaterialApiTest.java

@@ -6,8 +6,8 @@
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
 import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static jakarta.json.Json.createArrayBuilder;
+import static jakarta.json.Json.createObjectBuilder;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
@@ -40,8 +40,8 @@
 import java.util.UUID;
 import java.util.function.Function;
 
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
 
 import com.jayway.jsonpath.ReadContext;
 import org.hamcrest.Matcher;

prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateCCProsecutionApiTest.java

@@ -76,7 +76,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 
 import com.google.common.collect.ImmutableList;
 import org.junit.jupiter.api.Disabled;

prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateGroupProsecutionApiTest.java

@@ -30,7 +30,7 @@
 
 import java.util.UUID;
 
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.mockito.ArgumentCaptor;

prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateSjpProsecutionApiTest.java

@@ -40,8 +40,8 @@
 import java.util.List;
 import java.util.UUID;
 
-import javax.enterprise.inject.Instance;
-import javax.json.JsonObject;
+import jakarta.enterprise.inject.Instance;
+import jakarta.json.JsonObject;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;