Rolling forward keycloak22 build changes

build.gradle

@@ -2,11 +2,11 @@ import org.gradle.api.JavaVersion
 
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.7.17'
+    id 'org.springframework.boot' version '3.1.5'
     id 'io.spring.dependency-management' version '1.1.3'
 }
 
-def keycloakVersion = '15.0.2'
+def keycloakVersion = '22.0.5'
 def lombokVersion = '1.18.30'
 
 group = 'uk.gov.digital.ho.hocs'
@@ -26,30 +26,31 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-json'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
-    implementation "com.amazonaws:aws-java-sdk-sns:1.12.149"
-
+    implementation "com.amazonaws:aws-java-sdk-sns:1.12.472"
     implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
 
     implementation 'org.apache.httpcomponents:httpmime:4.5.14'
-    implementation 'javax.xml.bind:jaxb-api:2.3.1'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
+
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.3'
     implementation "org.keycloak:keycloak-admin-client:${keycloakVersion}"
     implementation "org.keycloak:keycloak-services:${keycloakVersion}"
 
     implementation 'org.apache.commons:commons-csv:1.10.0'
     implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
     implementation 'com.jayway.jsonpath:json-path:2.8.0'
-    implementation 'javax.json:javax.json-api:1.1.4'
+    implementation 'jakarta.json:jakarta.json-api:2.1.1'
+    implementation group: 'org.eclipse.parsson', name: 'parsson', version: '1.1.5'
 
     // This should be kept in line with the data Dockerfile versions
-    implementation 'org.flywaydb:flyway-core:9.20.0'
+    implementation 'org.flywaydb:flyway-core:9.19.3'
     runtimeOnly 'org.hsqldb:hsqldb'
     runtimeOnly 'org.postgresql:postgresql:42.6.0'
 
     compileOnly "org.projectlombok:lombok:${lombokVersion}"
     annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
     annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
-    annotationProcessor 'org.springframework:spring-context-indexer:5.3.23'
+    annotationProcessor 'org.springframework:spring-context-indexer:6.0.6'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.junit.vintage:junit-vintage-engine:5.10.1'

src/main/java/uk/gov/digital/ho/hocs/info/api/StandardLineService.java

@@ -12,7 +12,7 @@
 import uk.gov.digital.ho.hocs.info.domain.model.Topic;
 import uk.gov.digital.ho.hocs.info.domain.repository.StandardLineRepository;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;

src/main/java/uk/gov/digital/ho/hocs/info/api/UserResource.java

@@ -1,6 +1,6 @@
 package uk.gov.digital.ho.hocs.info.api;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/uk/gov/digital/ho/hocs/info/api/dto/CreateUserDto.java

@@ -1,6 +1,6 @@
 package uk.gov.digital.ho.hocs.info.api.dto;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/uk/gov/digital/ho/hocs/info/api/dto/UpdateUserDto.java

@@ -1,7 +1,7 @@
 package uk.gov.digital.ho.hocs.info.api.dto;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/uk/gov/digital/ho/hocs/info/application/LocalDateAttributeConverter.java

@@ -1,7 +1,7 @@
 package uk.gov.digital.ho.hocs.info.application;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 import java.sql.Date;
 import java.time.LocalDate;
 

src/main/java/uk/gov/digital/ho/hocs/info/application/LocalDateTimeAttributeConverter.java

@@ -1,7 +1,7 @@
 package uk.gov.digital.ho.hocs.info.application;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 

src/main/java/uk/gov/digital/ho/hocs/info/application/RequestData.java

@@ -5,8 +5,8 @@
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.UUID;
 
 @Component

src/main/java/uk/gov/digital/ho/hocs/info/client/audit/client/AuditClient.java

@@ -15,8 +15,8 @@
 import uk.gov.digital.ho.hocs.info.client.audit.client.dto.EventType;
 import uk.gov.digital.ho.hocs.info.domain.model.*;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
 import java.time.LocalDateTime;
 import java.util.Map;
 import java.util.Set;

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/CaseDetailsField.java

@@ -4,15 +4,15 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @Deprecated(forRemoval = true)
-@javax.persistence.Entity
+@jakarta.persistence.Entity
 @Table(name = "case_details_field")
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/CaseType.java

@@ -5,15 +5,15 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.ManyToOne;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
 import java.io.Serializable;
 import java.util.UUID;
 

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/CaseTypeAction.java

@@ -6,12 +6,12 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.util.UUID;

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/CaseTypeBankHolidayRegion.java

@@ -3,17 +3,17 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import uk.gov.digital.ho.hocs.info.domain.model.enums.BankHolidayRegion;
 
-import javax.persistence.Entity;
-import javax.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.*;
 import java.util.UUID;
 
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@TypeDef(name = "pgsql_enum", typeClass = org.hibernate.type.EnumType.class)
+@Convert(attributeName = "pgsql_enum", converter = org.hibernate.type.EnumType.class)
 @Table(name = "case_type_bank_holiday_region")
 public class CaseTypeBankHolidayRegion {
 
@@ -28,9 +28,8 @@ public class CaseTypeBankHolidayRegion {
     private UUID caseTypeUuid;
 
     @Getter
-    @Enumerated(EnumType.STRING)
     @Column(name = "region")
-    @Type(type = "pgsql_enum")
+    @Enumerated(EnumType.ORDINAL)
     private BankHolidayRegion region;
 
     public CaseTypeBankHolidayRegion(UUID caseTypeUuid, String region) {

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/CaseTypeCorrespondentType.java

@@ -1,18 +1,18 @@
 package uk.gov.digital.ho.hocs.info.domain.model;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.UUID;
 
-@javax.persistence.Entity
+@jakarta.persistence.Entity
 @Table(name = "case_type_correspondent_type")
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/CaseTypeSchema.java

@@ -1,18 +1,18 @@
 package uk.gov.digital.ho.hocs.info.domain.model;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.UUID;
 
-@javax.persistence.Entity
+@jakarta.persistence.Entity
 @Table(name = "case_type_schema")
 @NoArgsConstructor
 @Getter

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/Configuration.java

@@ -2,14 +2,14 @@
 
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
 @AllArgsConstructor()
 @NoArgsConstructor()
 @Getter
-@javax.persistence.Entity
+@jakarta.persistence.Entity
 @Table(name = "system_configuration")
 @EqualsAndHashCode(of = { "systemName" })
 @ToString

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/CorrespondentType.java

@@ -4,12 +4,12 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.UUID;
 

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/Country.java

@@ -1,11 +1,11 @@
 package uk.gov.digital.ho.hocs.info.domain.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/DocumentTag.java

@@ -4,12 +4,12 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.UUID;
 

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/Entity.java

@@ -1,10 +1,10 @@
 package uk.gov.digital.ho.hocs.info.domain.model;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -14,7 +14,7 @@
 
 @NoArgsConstructor
 @AllArgsConstructor
-@javax.persistence.Entity
+@jakarta.persistence.Entity
 @Table(name = "entity")
 public class Entity {
 

src/main/java/uk/gov/digital/ho/hocs/info/domain/model/EntityList.java

@@ -4,12 +4,12 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.UUID;
 
 @NoArgsConstructor
 @AllArgsConstructor
-@javax.persistence.Entity
+@jakarta.persistence.Entity
 @Table(name = "entity_list")
 public class EntityList {