diff --git a/ovs-integration-tests/pom.xml b/ovs-integration-tests/pom.xml
index c41d715..b3a833f 100644
--- a/ovs-integration-tests/pom.xml
+++ b/ovs-integration-tests/pom.xml
@@ -31,6 +31,8 @@
commons-logging
commons-logging
+ 1.2
+ runtime
io.rest-assured
diff --git a/ovs-persistence/pom.xml b/ovs-persistence/pom.xml
index f0d9c95..5dc41c8 100644
--- a/ovs-persistence/pom.xml
+++ b/ovs-persistence/pom.xml
@@ -21,8 +21,8 @@
spring-boot-starter-data-jpa
- javax.validation
- validation-api
+ jakarta.validation
+ jakarta.validation-api
org.postgresql
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
index 0693cbc..2a91b4b 100644
--- 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
index 04fb838..3973b93 100644
--- 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
index 92748ce..6bc18b9 100644
--- 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
index 1f611c5..7890ec4 100644
--- 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
index 6005c54..fcb7645 100644
--- 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
index a71040c..56467a6 100644
--- 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/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/VesselScheduleTerminalVisits.java b/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/VesselScheduleTerminalVisits.java
index cb5f885..951645e 100644
--- a/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/entity/VesselScheduleTerminalVisits.java
+++ b/ovs-persistence/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
index 37a1fce..25959fd 100644
--- 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
index 12c60f2..a32ea2c 100644
--- 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/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/repository/specification/ServiceSpecification.java b/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/repository/specification/ServiceSpecification.java
index 1c29ae5..9e3b621 100644
--- a/ovs-persistence/src/main/java/org/dcsa/ovs/persistence/repository/specification/ServiceSpecification.java
+++ b/ovs-persistence/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
index d80c3cb..ccc4344 100644
--- 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
index 9331a31..91fc9e3 100644
--- 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
index a7bbad1..fc94cd8 100644
--- 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
index 55ae7bd..d5cfe78 100644
--- a/ovs-transfer-obj/pom.xml
+++ b/ovs-transfer-obj/pom.xml
@@ -17,8 +17,8 @@
- javax.validation
- validation-api
+ jakarta.validation
+ jakarta.validation-api
com.fasterxml.jackson.core
diff --git a/pom.xml b/pom.xml
index 50cf78c..291f07e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.dcsa
dcsa-bom
- 1.3-SNAPSHOT
+ 1.5-SNAPSHOT
@@ -25,7 +25,7 @@
- 0.2.0
+ 0.3.0
-SNAPSHOT
${dcsa.shared-kernel.version}${dcsa.shared-kernel.tag}${dcsa.shared-kernel.artifacttype}