PEG-3562 PEG-3295 sjp: Java 25 / WildFly 40 / Jakarta EE 11 on the released 25.104.2 stack

azure-pipelines.yaml

@@ -21,12 +21,12 @@ resources:
       type: github
       name: hmcts/cpp-azure-devops-templates
       endpoint: 'hmcts'
-      ref: 'main'
+      ref: 'wildfly40'
 
 pool:
   name: "MDV-ADO-AGENT-AKS-01"
   demands:
-    - identifier -equals centos8-j17
+    - identifier -equals ubuntu-j25
 
 variables:
   sonarqubeProject: "uk.gov.moj.cpp.sjp:sjp-parent" # update eg: uk.gov.moj.cpp.listing:listing-parent
@@ -49,3 +49,4 @@ stages:
           sonarQubeType: 'sonarQubeAKS'
           serviceName: ${{ variables['service_Name'] }}
           itTestFolder: ${{ variables['itTest_Folder'] }}
+          aksDeployBranch: 'wildfly40'

docker/Dockerfile_sjp-service

@@ -7,7 +7,7 @@ ARG mavenArtifactBaseUrl
 ARG framework_libraries_version
 ARG framework_version
 ARG eventstore_version
-ARG activiti_version=17.21.1
+ARG activiti_version=25.104.0
 
 ARG wildfly_home=/opt/jboss/wildfly
 ARG wildfly_user=jboss

pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>17.104.3</version>
+        <version>25.104.2</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.sjp</groupId>
     <artifactId>sjp-parent</artifactId>
-    <version>17.104.193-SNAPSHOT</version>
+    <version>25.104.0-M1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -40,40 +40,40 @@
 
         <assignment.version>6.0.0</assignment.version>
         <access-control-sjp-providers.version>4.1.4-ATCM</access-control-sjp-providers.version>
-        <material.version>17.0.57</material.version>
+        <material.version>17.0.85</material.version>
         <notification.notify.version>17.0.1</notification.notify.version>
-        <referencedata.version>17.104.137</referencedata.version>
+        <referencedata.version>17.104.140</referencedata.version>
         <referencedata.offences.version>17.104.52</referencedata.offences.version>
         <scheduling.version>17.0.11</scheduling.version>
         <authorisation.service.version>0.1.49</authorisation.service.version>
         <usersgroups.version>17.104.48</usersgroups.version>
-        <progression.version>17.0.280</progression.version>
+        <progression.version>17.0.286</progression.version>
         <prosecutioncasefile.version>17.0.66</prosecutioncasefile.version>
         <access-control-sjp-providers.version>4.1.4-ATCM</access-control-sjp-providers.version>
         <cpp.framework.action.mapping.enabled>true</cpp.framework.action.mapping.enabled>
         <mvn.site.url>file://${project.build.directory}/site</mvn.site.url>
         <file.alfresco.version>2.3.0</file.alfresco.version>
-        <coredomain.version>17.104.4</coredomain.version>
+        <coredomain.version>25.104.2</coredomain.version>
         <criminal-court-public-model.version>${coredomain.version}</criminal-court-public-model.version>
-        <javax.el-api.version>3.0.0</javax.el-api.version>
+        <jakarta.el-api.version>6.0.1</jakarta.el-api.version>
         <joda-time.version>2.10</joda-time.version>
-        <lombok.version>1.18.20</lombok.version>
+        <lombok.version>1.18.40</lombok.version>
         <activiti.library.version>1.3.0</activiti.library.version>
         <pojo-generation.version>1.6.0-M1</pojo-generation.version>
         <systemdocgenerator.version>17.0.96</systemdocgenerator.version>
         <document-generator-client.version>1.0.4</document-generator-client.version>
         <apache.pdfbox.version>2.0.11</apache.pdfbox.version>
         <argLine>-Djava.locale.providers=CLDR</argLine>
         <elasticsearch-maven-plugin.version>6.13</elasticsearch-maven-plugin.version>
-        <elasticsearch.embedded.version>7.16.2</elasticsearch.embedded.version>
+        <elasticsearch.embedded.version>9.3.3</elasticsearch.embedded.version>
         <stagingenforcement.version>17.104.81</stagingenforcement.version>
         <unifiedsearch.version>17.0.26</unifiedsearch.version>
         <jsonassert.version>1.5.0</jsonassert.version>
         <junit4.version>4.13.1</junit4.version>
         <maven.cucumber.reporting.version>2.0.0</maven.cucumber.reporting.version>
         <jgitflow-maven-plugin.version>1.0-m5.1</jgitflow-maven-plugin.version>
         <jgitflow.maven.developBranchName>main</jgitflow.maven.developBranchName>
-        <h2.version>1.4.196</h2.version>
+        <h2.version>2.3.232</h2.version>
     </properties>
 
     <modules>

sjp-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-parent</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.193-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

sjp-command/sjp-command-api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-command</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.193-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,8 +29,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -98,10 +98,15 @@
                 <artifactId>messaging-client-generator-plugin</artifactId>
                 <dependencies>
                     <dependency>
-                        <groupId>javax</groupId>
-                        <artifactId>javaee-api</artifactId>
+                        <groupId>jakarta.platform</groupId>
+                        <artifactId>jakarta.jakartaee-api</artifactId>
                         <version>${javaee-api.version}</version>
                     </dependency>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>${jakarta.xml.bind-api.raml.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>uk.gov.moj.cpp.sjp</groupId>
                         <artifactId>sjp-command-controller</artifactId>
@@ -121,10 +126,15 @@
                 <artifactId>rest-client-generator-plugin</artifactId>
                 <dependencies>
                     <dependency>
-                        <groupId>javax</groupId>
-                        <artifactId>javaee-api</artifactId>
+                        <groupId>jakarta.platform</groupId>
+                        <artifactId>jakarta.jakartaee-api</artifactId>
                         <version>${javaee-api.version}</version>
                     </dependency>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>${jakarta.xml.bind-api.raml.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>uk.gov.moj.cpp.sjp</groupId>
                         <artifactId>sjp-query-api</artifactId>

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddCaseDocumentApi.java

@@ -8,7 +8,7 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @ServiceComponent(COMMAND_API)
 public class AddCaseDocumentApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApi.java

@@ -9,7 +9,7 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * This command is only used for ATCM-6980 BDF and can be deprecated once ran however the event

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApi.java

@@ -9,7 +9,7 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @ServiceComponent(COMMAND_API)
 public class AddFinancialImpositionCorrelationIdApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimerExpiredApi.java

@@ -10,7 +10,7 @@
 import uk.gov.justice.services.messaging.JsonEnvelope;
 import uk.gov.moj.cpp.sjp.command.api.service.CaseService;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @ServiceComponent(COMMAND_API)
 public class AocpResponseTimerExpiredApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseAssignmentRestrictionApi.java

@@ -10,8 +10,8 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.Envelope;
 
-import javax.inject.Inject;
-import javax.json.JsonObject;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
 
 @ServiceComponent(COMMAND_API)
 public class CaseAssignmentRestrictionApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApi.java

@@ -13,9 +13,9 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
-import javax.json.JsonObject;
-import javax.ws.rs.BadRequestException;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.BadRequestException;
 
 @ServiceComponent(COMMAND_API)
 public class CaseNoteApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseReopenedApi.java

@@ -14,8 +14,8 @@
 import java.time.LocalDate;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.json.JsonObject;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
 
 /**
  * Command api for marking a case as reopened.

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApi.java

@@ -19,11 +19,11 @@
 
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.inject.Inject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
 @ServiceComponent(COMMAND_API)
 public class CreateCaseApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApi.java

@@ -5,7 +5,7 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DatesToAvoidApi.java

@@ -8,7 +8,7 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @ServiceComponent(COMMAND_API)
 public class DatesToAvoidApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DecisionApi.java

@@ -30,9 +30,9 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
 @ServiceComponent(COMMAND_API)
 public class DecisionApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApi.java

@@ -11,9 +11,9 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
 @SuppressWarnings("squid:CallToDeprecatedMethod")
 @ServiceComponent(COMMAND_API)

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DeleteCaseDocumentApi.java

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

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/EmployerApi.java

@@ -11,9 +11,9 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
 @ServiceComponent(COMMAND_API)
 public class EmployerApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/FinancialMeansApi.java

@@ -8,7 +8,7 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @ServiceComponent(COMMAND_API)
 public class FinancialMeansApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/MarkAsLegalSocCheckedApi.java

@@ -7,8 +7,8 @@
 import uk.gov.justice.services.messaging.Envelope;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
-import javax.json.JsonObject;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
 
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.Envelope.metadataFrom;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApi.java

@@ -8,8 +8,8 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
-import javax.json.JsonObject;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
 
 @ServiceComponent(COMMAND_API)
 public class OffenceWithdrawalRequestApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApi.java

@@ -27,10 +27,10 @@
 import java.util.Map;
 import java.util.Objects;
 
-import javax.inject.Inject;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PressTransparencyReportApi.java

@@ -9,7 +9,7 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @ServiceComponent(COMMAND_API)
 public class PressTransparencyReportApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/RequestDeleteDocsApi.java

@@ -8,7 +8,7 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @ServiceComponent(COMMAND_API)
 public class RequestDeleteDocsApi {

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ReserveCaseApi.java

@@ -5,7 +5,7 @@
 import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom;
 
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;
 import uk.gov.justice.services.core.enveloper.Enveloper;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveCaseStatusApi.java

@@ -9,9 +9,9 @@
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
-import javax.inject.Inject;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.inject.Inject;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
 @ServiceComponent(COMMAND_API)
 public class ResolveCaseStatusApi {