Migrate to spring-boot 3

Signed-off-by: Niels Thykier <[email protected]>
dcsaorg · Jan 5, 2023 · 7e43874 · 7e43874
1 parent 2c709af
commit 7e43874
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 48 deletions.
diff --git a/ovs-integration-tests/pom.xml b/ovs-integration-tests/pom.xml
@@ -31,6 +31,8 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
+			<version>1.2</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.rest-assured</groupId>

diff --git a/ovs-persistence/pom.xml b/ovs-persistence/pom.xml
@@ -21,8 +21,8 @@
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>

diff --git a/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/Service.java b/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/Service.java
@@ -1,9 +1,9 @@
 package org.dcsa.ovs.persistence.entity;
 
+import jakarta.persistence.*;
 import lombok.*;
 import org.dcsa.skernel.domain.persistence.entity.Carrier;
 
-import javax.persistence.*;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.UUID;

diff --git a/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/Tradelane.java b/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/Tradelane.java
@@ -9,13 +9,13 @@
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 @Data
 @Builder

diff --git a/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/TransportCall.java b/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/TransportCall.java
@@ -5,7 +5,7 @@
 import org.dcsa.skernel.domain.persistence.entity.Facility;
 import org.dcsa.skernel.domain.persistence.entity.Location;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.UUID;

diff --git a/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/TransportEvent.java b/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/TransportEvent.java
@@ -2,7 +2,7 @@
 
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.OffsetDateTime;
 import java.util.UUID;
 

diff --git a/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/Vessel.java b/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/Vessel.java
@@ -2,7 +2,7 @@
 
 import lombok.*;
 import org.dcsa.skernel.domain.persistence.entity.Carrier;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.UUID;

diff --git a/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/VesselSchedule.java b/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/VesselSchedule.java
@@ -2,7 +2,7 @@
 
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.OffsetDateTime;
 import java.util.UUID;
 

diff --git a/...rsistence/src/main/java/org/dcsa/ovs/persistence/entity/VesselScheduleTerminalVisits.java b/...rsistence/src/main/java/org/dcsa/ovs/persistence/entity/VesselScheduleTerminalVisits.java
@@ -9,14 +9,14 @@
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import java.time.OffsetDateTime;
 import java.util.UUID;
 

diff --git a/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/VesselSharingAgreement.java b/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/VesselSharingAgreement.java
@@ -7,11 +7,11 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 @Data

diff --git a/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/Voyage.java b/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/Voyage.java
@@ -9,14 +9,14 @@
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 @Data

diff --git a/...src/main/java/org/dcsa/ovs/persistence/repository/specification/ServiceSpecification.java b/...src/main/java/org/dcsa/ovs/persistence/repository/specification/ServiceSpecification.java
@@ -8,9 +8,9 @@
 import org.dcsa.skernel.domain.persistence.entity.Location;
 import org.springframework.data.jpa.domain.Specification;
 
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Predicate;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;

diff --git a/ovs-service/src/main/java/org/dcsa/ovs/controller/ServiceScheduleController.java b/ovs-service/src/main/java/org/dcsa/ovs/controller/ServiceScheduleController.java
@@ -17,9 +17,9 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.Size;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 @Validated

diff --git a/ovs-service/src/main/resources/application.yml b/ovs-service/src/main/resources/application.yml
@@ -13,7 +13,7 @@ spring:
     hikari:
       schema: dcsa_im_v3_0
   jpa:
-    database-platform: org.hibernate.dialect.PostgreSQL10Dialect
+    database-platform: org.hibernate.dialect.PostgreSQLDialect
     hibernate.ddl-auto: validate
   security:
     oauth2:

diff --git a/ovs-service/src/test/java/org/dcsa/ovs/controller/ServiceScheduleControllerTest.java b/ovs-service/src/test/java/org/dcsa/ovs/controller/ServiceScheduleControllerTest.java
@@ -3,7 +3,10 @@
 import org.dcsa.ovs.datafactories.ServiceScheduleTODataFactory;
 import org.dcsa.ovs.mapping.ServiceScheduleMapper;
 import org.dcsa.ovs.service.VesselScheduleService;
-import org.dcsa.skernel.errors.infrastructure.*;
+import org.dcsa.skernel.errors.infrastructure.ConcreteRequestErrorMessageExceptionHandler;
+import org.dcsa.skernel.errors.infrastructure.FallbackExceptionHandler;
+import org.dcsa.skernel.errors.infrastructure.JakartaValidationExceptionHandler;
+import org.dcsa.skernel.errors.infrastructure.SpringExceptionHandler;
 import org.dcsa.skernel.infrastructure.pagination.PagedResult;
 import org.dcsa.skernel.infrastructure.pagination.Paginator;
 import org.junit.jupiter.api.DisplayName;
@@ -31,7 +34,7 @@
   SpringExceptionHandler.class,
   ConcreteRequestErrorMessageExceptionHandler.class,
   FallbackExceptionHandler.class,
-  JavaxValidationExceptionHandler.class
+  JakartaValidationExceptionHandler.class
 })
 class ServiceScheduleControllerTest {
 

diff --git a/ovs-transfer-obj/pom.xml b/ovs-transfer-obj/pom.xml
@@ -17,8 +17,8 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.dcsa</groupId>
 		<artifactId>dcsa-bom</artifactId>
-		<version>1.3-SNAPSHOT</version>
+		<version>1.5-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -25,7 +25,7 @@
 		<!-- End: Define DCSA-OVS version -->
 
 		<!-- Define Shared Kernel version -->
-		<dcsa.shared-kernel.version>0.2.0</dcsa.shared-kernel.version>
+		<dcsa.shared-kernel.version>0.3.0</dcsa.shared-kernel.version>
 		<dcsa.shared-kernel.tag/>
 		<dcsa.shared-kernel.artifacttype>-SNAPSHOT</dcsa.shared-kernel.artifacttype>
 		<shared-kernel.version>${dcsa.shared-kernel.version}${dcsa.shared-kernel.tag}${dcsa.shared-kernel.artifacttype}</shared-kernel.version>