On branch edburns-msft-em-5413-cargotracker-liberty-aks-ee-10 All of …

…these files can be safely copied from the upstream.

modified:   Dockerfile
modified:   src/main/java/org/eclipse/cargotracker/application/BookingService.java
modified:   src/main/java/org/eclipse/cargotracker/application/CargoInspectionService.java
modified:   src/main/java/org/eclipse/cargotracker/application/HandlingEventService.java
modified:   src/main/java/org/eclipse/cargotracker/application/internal/DefaultBookingService.java
modified:   src/main/java/org/eclipse/cargotracker/application/internal/DefaultCargoInspectionService.java
modified:   src/main/java/org/eclipse/cargotracker/application/internal/DefaultHandlingEventService.java
modified:   src/main/java/org/eclipse/cargotracker/application/package.html
modified:   src/main/java/org/eclipse/cargotracker/application/util/ApplicationSettings.java
modified:   src/main/java/org/eclipse/cargotracker/application/util/RestConfiguration.java
modified:   src/main/java/org/eclipse/cargotracker/application/util/SampleDataGenerator.java
modified:   src/main/java/org/eclipse/cargotracker/application/util/package.html
modified:   src/main/java/org/eclipse/cargotracker/domain/model/cargo/Delivery.java
modified:   src/main/java/org/eclipse/cargotracker/domain/model/cargo/HandlingActivity.java
modified:   src/main/java/org/eclipse/cargotracker/domain/model/cargo/Itinerary.java
modified:   src/main/java/org/eclipse/cargotracker/domain/model/cargo/Leg.java
modified:   src/main/java/org/eclipse/cargotracker/domain/model/cargo/RouteSpecification.java
modified:   src/main/java/org/eclipse/cargotracker/domain/model/cargo/TrackingId.java
modified:   src/main/java/org/eclipse/cargotracker/domain/model/cargo/package.html
modified:   src/main/java/org/eclipse/cargotracker/domain/model/handling/CannotCreateHandlingEventException.java
modified:   src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingEventFactory.java
modified:   src/main/java/org/eclipse/cargotracker/domain/model/handling/package.html
modified:   src/main/java/org/eclipse/cargotracker/domain/model/location/UnLocode.java
modified:   src/main/java/org/eclipse/cargotracker/domain/model/location/package.html
modified:   src/main/java/org/eclipse/cargotracker/domain/model/package.html
modified:   src/main/java/org/eclipse/cargotracker/domain/model/voyage/Schedule.java
modified:   src/main/java/org/eclipse/cargotracker/domain/model/voyage/VoyageNumber.java
modified:   src/main/java/org/eclipse/cargotracker/domain/model/voyage/package.html
modified:   src/main/java/org/eclipse/cargotracker/domain/package.html
modified:   src/main/java/org/eclipse/cargotracker/domain/service/package.html
modified:   src/main/java/org/eclipse/cargotracker/domain/shared/package.html
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/events/cdi/CargoUpdated.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/logging/LoggerProducer.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/CargoHandledConsumer.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/DeliveredCargoConsumer.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/HandlingEventRegistrationAttemptConsumer.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/JmsApplicationEvents.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/MisdirectedCargoConsumer.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/RejectedRegistrationAttemptsConsumer.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/package.html
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaCargoRepository.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaHandlingEventRepository.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaLocationRepository.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaVoyageRepository.java
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/package.html
modified:   src/main/java/org/eclipse/cargotracker/infrastructure/routing/package.html
modified:   src/main/java/org/eclipse/cargotracker/interfaces/FacesConfiguration.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/dto/package.html
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/DefaultBookingServiceFacade.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/CargoRouteDtoAssembler.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/CargoStatusDtoAssembler.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/ItineraryCandidateDtoAssembler.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/LocationDtoAssembler.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/TrackingEventsDtoAssembler.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/package.html
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/package.html
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/package.html
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/web/Booking.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/web/CargoDetails.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeArrivalDeadline.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeArrivalDeadlineDialog.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeDestination.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeDestinationDialog.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ItinerarySelection.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ListCargo.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/web/Track.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/booking/web/package.html
modified:   src/main/java/org/eclipse/cargotracker/interfaces/handling/file/EventItemReader.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/handling/file/EventItemWriter.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/handling/file/FileProcessorJobListener.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/handling/file/LineParseExceptionListener.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/handling/file/package.html
modified:   src/main/java/org/eclipse/cargotracker/interfaces/handling/mobile/EventLogger.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/handling/mobile/package.html
modified:   src/main/java/org/eclipse/cargotracker/interfaces/handling/package.html
modified:   src/main/java/org/eclipse/cargotracker/interfaces/handling/rest/HandlingReport.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/handling/rest/HandlingReportService.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/handling/rest/package.html
modified:   src/main/java/org/eclipse/cargotracker/interfaces/tracking/web/Track.java
modified:   src/main/java/org/eclipse/cargotracker/interfaces/tracking/web/package.html
modified:   src/main/java/org/eclipse/pathfinder/api/TransitPath.java
modified:   src/main/java/org/eclipse/pathfinder/api/package.html
modified:   src/main/java/org/eclipse/pathfinder/internal/GraphDao.java
modified:   src/main/java/org/eclipse/pathfinder/internal/package.html
modified:   src/main/java/org/eclipse/pathfinder/package.html
modified:   src/main/resources/META-INF/batch-jobs/EventFilesProcessorJob.xml
modified:   src/main/resources/META-INF/initital-data.sql
modified:   src/main/webapp/WEB-INF/beans.xml
modified:   src/main/webapp/WEB-INF/faces-config.xml
modified:   src/main/webapp/WEB-INF/glassfish-web.xml
modified:   src/main/webapp/booking/booking-flow.xml
modified:   src/main/webapp/resources/css/app.css
modified:   src/main/webapp/resources/css/dd.css
modified:   src/main/webapp/resources/css/title.css
modified:   src/main/webapp/resources/leaflet/leaflet.css
modified:   src/test/java/org/eclipse/cargotracker/application/BookingServiceTest.java
modified:   src/test/java/org/eclipse/cargotracker/application/BookingServiceTestDataGenerator.java
modified:   src/test/java/org/eclipse/cargotracker/domain/model/cargo/CargoTest.java
modified:   src/test/java/org/eclipse/cargotracker/domain/model/cargo/ItineraryTest.java
modified:   src/test/java/org/eclipse/cargotracker/domain/model/cargo/RouteSpecificationTest.java
modified:   src/test/java/org/eclipse/cargotracker/domain/model/handling/HandlingEventTest.java
modified:   src/test/java/org/eclipse/cargotracker/domain/model/handling/HandlingHistoryTest.java
modified:   src/test/java/org/eclipse/cargotracker/infrastructure/routing/ExternalRoutingServiceTest.java
modified:   src/test/java/org/eclipse/cargotracker/scenario/CargoLifecycleScenarioTest.java
modified:   src/test/resources/arquillian.xml
modified:   src/test/sample/handling_events.csv
modified:   src/test/soapui/cargo_tracker_soapUI_project.xml
modified:   src/test/soapui/handling_report_sample.json
modified:   src/test/soapui/handling_report_sample.xml

Signed-off-by: Ed Burns <[email protected]>

Dockerfile

@@ -1,5 +1,5 @@
-FROM payara/server-full
+FROM payara/server-full:6.2023.12
 
 COPY target/postgresql.jar /tmp
 COPY target/cargo-tracker.war /tmp
-COPY post-boot-commands.asadmin /opt/payara/config/
+COPY post-boot-commands.asadmin /opt/payara/config/

src/main/java/org/eclipse/cargotracker/application/BookingService.java

@@ -2,9 +2,9 @@
 
 import java.time.LocalDate;
 import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.Future;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Future;
+import jakarta.validation.constraints.NotNull;
 import org.eclipse.cargotracker.domain.model.cargo.Itinerary;
 import org.eclipse.cargotracker.domain.model.cargo.TrackingId;
 import org.eclipse.cargotracker.domain.model.location.UnLocode;

src/main/java/org/eclipse/cargotracker/application/CargoInspectionService.java

@@ -1,7 +1,7 @@
 package org.eclipse.cargotracker.application;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import org.eclipse.cargotracker.domain.model.cargo.TrackingId;
 
 public interface CargoInspectionService {

src/main/java/org/eclipse/cargotracker/application/HandlingEventService.java

@@ -1,8 +1,8 @@
 package org.eclipse.cargotracker.application;
 
 import java.time.LocalDateTime;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import org.eclipse.cargotracker.domain.model.cargo.TrackingId;
 import org.eclipse.cargotracker.domain.model.handling.CannotCreateHandlingEventException;
 import org.eclipse.cargotracker.domain.model.handling.HandlingEvent;

src/main/java/org/eclipse/cargotracker/application/internal/DefaultBookingService.java

@@ -5,8 +5,8 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
 import org.eclipse.cargotracker.application.BookingService;
 import org.eclipse.cargotracker.domain.model.cargo.Cargo;
 import org.eclipse.cargotracker.domain.model.cargo.CargoRepository;

src/main/java/org/eclipse/cargotracker/application/internal/DefaultCargoInspectionService.java

@@ -2,8 +2,8 @@
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
 import org.eclipse.cargotracker.application.ApplicationEvents;
 import org.eclipse.cargotracker.application.CargoInspectionService;
 import org.eclipse.cargotracker.domain.model.cargo.Cargo;

src/main/java/org/eclipse/cargotracker/application/internal/DefaultHandlingEventService.java

@@ -2,8 +2,8 @@
 
 import java.time.LocalDateTime;
 import java.util.logging.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
 import org.eclipse.cargotracker.application.ApplicationEvents;
 import org.eclipse.cargotracker.application.HandlingEventService;
 import org.eclipse.cargotracker.domain.model.cargo.TrackingId;

src/main/java/org/eclipse/cargotracker/application/package.html

@@ -1,12 +1,11 @@
 <html>
 <body>
-<p>This is the application layer: code that's needed for the
-    application to performs its tasks. It defines, or is defined by, use
-    cases.</p>
-<p>It is thin in terms of knowledge of domain business logic,
-    although it may be large in terms of lines of code. It coordinates the
-    domain layer objects to perform the actual tasks.</p>
-<p>This layer is suitable for spanning transactions, security
-    checks and high-level logging.</p>
+  <p>This is the application layer: code that's needed for the application
+    to performs its tasks. It defines, or is defined by, use cases.</p>
+  <p>It is thin in terms of knowledge of domain business logic, although it
+    may be large in terms of lines of code. It coordinates the domain layer
+    objects to perform the actual tasks.</p>
+  <p>This layer is suitable for spanning transactions, security checks and
+    high-level logging.</p>
 </body>
 </html>

src/main/java/org/eclipse/cargotracker/application/util/ApplicationSettings.java

@@ -1,8 +1,8 @@
 package org.eclipse.cargotracker.application.util;
 
 import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 /**
  * Application settings. Although this is stored in the database, it is not a true part of the

src/main/java/org/eclipse/cargotracker/application/util/RestConfiguration.java

@@ -2,8 +2,8 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
 import org.glassfish.jersey.server.ServerProperties;
 
 /** Jakarta REST configuration. */

src/main/java/org/eclipse/cargotracker/application/util/SampleDataGenerator.java

@@ -4,16 +4,16 @@
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
 import org.eclipse.cargotracker.domain.model.cargo.Cargo;
 import org.eclipse.cargotracker.domain.model.cargo.Itinerary;
 import org.eclipse.cargotracker.domain.model.cargo.Leg;

src/main/java/org/eclipse/cargotracker/application/util/package.html

@@ -1,5 +1,5 @@
 <html>
 <body>
-<p>Various utilities.</p>
+  <p>Various utilities.</p>
 </body>
-</html>
+</html>

src/main/java/org/eclipse/cargotracker/domain/model/cargo/Delivery.java

@@ -13,14 +13,14 @@
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Iterator;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

src/main/java/org/eclipse/cargotracker/domain/model/cargo/HandlingActivity.java

@@ -1,13 +1,13 @@
 package org.eclipse.cargotracker.domain.model.cargo;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

src/main/java/org/eclipse/cargotracker/domain/model/cargo/Itinerary.java

@@ -4,13 +4,13 @@
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Embeddable;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Size;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.Validate;
 import org.eclipse.cargotracker.domain.model.handling.HandlingEvent;
 import org.eclipse.cargotracker.domain.model.location.Location;

src/main/java/org/eclipse/cargotracker/domain/model/cargo/Leg.java

@@ -3,15 +3,13 @@
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -23,10 +21,7 @@ public class Leg implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
-  @Id 
-  @SequenceGenerator(name = "seq", sequenceName = "cargotracker_seq", allocationSize = 50)
-  @GeneratedValue (strategy = GenerationType.AUTO, generator = "seq")
-  private Long id;
+  @Id @GeneratedValue private Long id;
 
   @ManyToOne
   @JoinColumn(name = "voyage_id")

src/main/java/org/eclipse/cargotracker/domain/model/cargo/RouteSpecification.java

@@ -2,11 +2,11 @@
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

src/main/java/org/eclipse/cargotracker/domain/model/cargo/TrackingId.java

@@ -1,9 +1,9 @@
 package org.eclipse.cargotracker.domain.model.cargo;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.validation.constraints.NotEmpty;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.validation.constraints.NotEmpty;
 import org.apache.commons.lang3.Validate;
 
 /** Uniquely identifies a particular cargo. Automatically generated by the application. */

src/main/java/org/eclipse/cargotracker/domain/model/cargo/package.html

@@ -1,5 +1,5 @@
 <html>
 <body>
-<p>The cargo aggregate. Cargo is the aggregate root.</p>
+  <p>The cargo aggregate. Cargo is the aggregate root.</p>
 </body>
 </html>

src/main/java/org/eclipse/cargotracker/domain/model/handling/CannotCreateHandlingEventException.java

@@ -1,6 +1,6 @@
 package org.eclipse.cargotracker.domain.model.handling;
 
-import javax.ejb.ApplicationException;
+import jakarta.ejb.ApplicationException;
 
 /**
  * If a {@link HandlingEvent} can't be created from a given set of parameters.

src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingEventFactory.java

@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.eclipse.cargotracker.domain.model.cargo.Cargo;
 import org.eclipse.cargotracker.domain.model.cargo.CargoRepository;
 import org.eclipse.cargotracker.domain.model.cargo.TrackingId;

src/main/java/org/eclipse/cargotracker/domain/model/handling/package.html

@@ -1,5 +1,5 @@
 <html>
 <body>
-<p>The handling aggregate. HandlingEvent is the aggregate root.</p>
+  <p>The handling aggregate. HandlingEvent is the aggregate root.</p>
 </body>
 </html>

src/main/java/org/eclipse/cargotracker/domain/model/location/UnLocode.java

@@ -1,9 +1,9 @@
 package org.eclipse.cargotracker.domain.model.location;
 
 import java.io.Serializable;
-import javax.persistence.Embeddable;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Pattern;
+import jakarta.persistence.Embeddable;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Pattern;
 import org.apache.commons.lang3.Validate;
 
 /**

src/main/java/org/eclipse/cargotracker/domain/model/location/package.html

@@ -1,5 +1,5 @@
 <html>
 <body>
-<p>The location aggregate. Location is the aggregate root.</p>
+  <p>The location aggregate. Location is the aggregate root.</p>
 </body>
-</html>
+</html>

src/main/java/org/eclipse/cargotracker/domain/model/package.html

@@ -1,7 +1,7 @@
 <html>
 <body>
-<p>The domain model. This is the heart of the application. Each
-    aggregate is contained in its own sub-package, along with the
-    repository interface, factories and exceptions where applicable.</p>
+  <p>The domain model. This is the heart of the application. Each aggregate
+    is contained in its own sub-package, along with the repository interface,
+    factories and exceptions where applicable.</p>
 </body>
 </html>

src/main/java/org/eclipse/cargotracker/domain/model/voyage/Schedule.java

@@ -3,13 +3,13 @@
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Embeddable;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 

src/main/java/org/eclipse/cargotracker/domain/model/voyage/VoyageNumber.java

@@ -1,9 +1,9 @@
 package org.eclipse.cargotracker.domain.model.voyage;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.validation.constraints.NotEmpty;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.validation.constraints.NotEmpty;
 import org.apache.commons.lang3.Validate;
 
 @Embeddable

src/main/java/org/eclipse/cargotracker/domain/model/voyage/package.html

@@ -1,5 +1,5 @@
-<html>
-<body>
-<p>The voyage aggregate. Voyage is the aggregate root.</p>
-</body>
-</html>
+<html>
+<body>
+  <p>The voyage aggregate. Voyage is the aggregate root.</p>
+</body>
+</html>