diff --git a/.github/workflows/PR-pipeline.yml b/.github/workflows/PR-pipeline.yml
index 7758104..10e89c1 100644
--- a/.github/workflows/PR-pipeline.yml
+++ b/.github/workflows/PR-pipeline.yml
@@ -15,10 +15,10 @@ jobs:
     steps:
       - name: Download repository
         uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Cache Maven packages
         uses: actions/cache@v3
@@ -46,10 +46,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
@@ -83,10 +83,10 @@ jobs:
     steps:
       - name: Download repository
         uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Cache
         uses: actions/cache@v3.3.1
diff --git a/.github/workflows/maven-packages-publish.yml b/.github/workflows/maven-packages-publish.yml
index 65cb511..6d342d4 100644
--- a/.github/workflows/maven-packages-publish.yml
+++ b/.github/workflows/maven-packages-publish.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: maven install
         run: mvn clean install
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e916e60..ef77bad 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,10 +22,10 @@ jobs:
     steps:
       - name: Download repository
         uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Cache Maven packages
         uses: actions/cache@v3
@@ -78,10 +78,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
@@ -108,10 +108,10 @@ jobs:
     steps:
       - name: Download repository
         uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Cache Maven packages
         uses: actions/cache@v3
@@ -152,10 +152,10 @@ jobs:
     steps:
       - name: Download repository
         uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Cache
         uses: actions/cache@v3.3.1
diff --git a/base-domain/pom.xml b/base-domain/pom.xml
index 630c7dc..21676cb 100644
--- a/base-domain/pom.xml
+++ b/base-domain/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <artifactId>spring-boot-starter-data-mongodb</artifactId>
       <groupId>org.springframework.boot</groupId>
-      <version>2.7.14</version>
+      <version>3.1.2</version>
     </dependency>
     <dependency>
       <artifactId>de.flapdoodle.embed.mongo</artifactId>
@@ -73,9 +73,9 @@
   </distributionManagement>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <java.version>11</java.version>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.plugin.validation>VERBOSE</maven.plugin.validation>
     <revision>1.0.0-SNAPSHOT</revision>
diff --git a/inventory/pom.xml b/inventory/pom.xml
index a0ee319..94f625f 100644
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -2,228 +2,228 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <artifactId>inventory</artifactId>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.diffplug.spotless</groupId>
-                <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.22.1</version>
-                <executions>
-                    <execution>
-                        <id>apply</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>apply</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <java>
-                        <includes>
-                            <include>src/main/java/**/*.java</include>
-                            <include>src/test/java/**/*.java</include>
-                        </includes>
-                        <importOrder/>
-                        <removeUnusedImports/>
-                        <googleJavaFormat/>
-                    </java>
-                </configuration>
-            </plugin>
+  <artifactId>inventory</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.35.0</version>
+        <executions>
+          <execution>
+            <id>apply</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>apply</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>check</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <java>
+            <includes>
+              <include>src/main/java/**/*.java</include>
+              <include>src/test/java/**/*.java</include>
+            </includes>
+            <importOrder/>
+            <removeUnusedImports/>
+            <googleJavaFormat/>
+          </java>
+        </configuration>
+      </plugin>
 
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.3.2.RELEASE</version>
-            </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>2.3.2.RELEASE</version>
+      </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.10.1</version>
+        <configuration>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+        </configuration>
+      </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>qa</classifier>
-                            <excludes>
-                                <exclude>**/Application*</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.3.0</version>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <classifier>qa</classifier>
+              <excludes>
+                <exclude>**/Application*</exclude>
+              </excludes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
 
-            <!-- Jacoco -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <excludes>
-                        <exclude>**/model/*.class</exclude>
-                        <exclude>**/InventoryApplication.class</exclude>
-                        <exclude>**/SwaggerConfig.class</exclude>
-                        <exclude>**/dto/*.class</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
+      <!-- Jacoco -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.8</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <excludes>
+            <exclude>**/model/*.class</exclude>
+            <exclude>**/InventoryApplication.class</exclude>
+            <exclude>**/SwaggerConfig.class</exclude>
+            <exclude>**/dto/*.class</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
 
-            <!-- PITest-->
+      <!-- PITest-->
 
-            <plugin>
-                <groupId>org.pitest</groupId>
-                <artifactId>pitest-maven</artifactId>
-                <version>1.7.5</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.pitest</groupId>
-                        <artifactId>pitest-junit5-plugin</artifactId>
-                        <version>0.12</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <excludedTestClasses>com.ecommerceapp.inventory.integration.*</excludedTestClasses>
-                    <excludedTestClasses>com.ecommerceapp.inventory.contract.*</excludedTestClasses>
-                    <targetClasses>
-                        <param>com.ecommerceapp.inventory.controller.*</param>
-                        <param>com.ecommerceapp.inventory.repository.*</param>
-                        <param>com.ecommerceapp.inventory.service.*</param>
-                    </targetClasses>
-                    <outputFormats>
-                        <param>HTML</param>
-                        <param>XML</param>
-                    </outputFormats>
-                    <!-- omitting mutators, testPlugin and verbose for brevity -->
-                    <exportLineCoverage>true</exportLineCoverage>
-                    <!--
-                        it's currently not possible to aggregate timestamped
-                        reports, so it must be disabled.
-                     -->
-                    <timestampedReports>false</timestampedReports>
-                </configuration>
-            </plugin>
+      <plugin>
+        <groupId>org.pitest</groupId>
+        <artifactId>pitest-maven</artifactId>
+        <version>1.7.5</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.pitest</groupId>
+            <artifactId>pitest-junit5-plugin</artifactId>
+            <version>0.12</version>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <excludedTestClasses>com.ecommerceapp.inventory.integration.*</excludedTestClasses>
+          <excludedTestClasses>com.ecommerceapp.inventory.contract.*</excludedTestClasses>
+          <targetClasses>
+            <param>com.ecommerceapp.inventory.controller.*</param>
+            <param>com.ecommerceapp.inventory.repository.*</param>
+            <param>com.ecommerceapp.inventory.service.*</param>
+          </targetClasses>
+          <outputFormats>
+            <param>HTML</param>
+            <param>XML</param>
+          </outputFormats>
+          <!-- omitting mutators, testPlugin and verbose for brevity -->
+          <exportLineCoverage>true</exportLineCoverage>
+          <!--
+              it's currently not possible to aggregate timestamped
+              reports, so it must be disabled.
+           -->
+          <timestampedReports>false</timestampedReports>
+        </configuration>
+      </plugin>
 
-        </plugins>
-    </build>
+    </plugins>
+  </build>
 
-    <dependencies>
-      <dependency>
-        <groupId>com.ecommerceapp</groupId>
-        <artifactId>base-domain</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-      </dependency>
-        <dependency>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-            <groupId>org.springframework.boot</groupId>
-            <version>2.7.14</version>
-        </dependency>
-        <dependency>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <groupId>org.springframework.boot</groupId>
-            <version>2.7.14</version>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>com.ecommerceapp</groupId>
+      <artifactId>base-domain</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <version>2.7.14</version>
+    </dependency>
+    <dependency>
+      <artifactId>spring-boot-starter-web</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <version>2.7.14</version>
+    </dependency>
 
-        <dependency>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>junit-vintage-engine</artifactId>
-                    <groupId>org.junit.vintage</groupId>
-                </exclusion>
-            </exclusions>
-            <groupId>org.springframework.boot</groupId>
-            <version>3.1.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>persistence-api</artifactId>
-            <groupId>javax.persistence</groupId>
-            <version>1.0.2</version>
-        </dependency>
-        <dependency>
-            <artifactId>spring-boot-starter-data-mongodb</artifactId>
-            <groupId>org.springframework.boot</groupId>
-            <version>3.1.2</version>
-        </dependency>
-        <dependency>
-            <artifactId>de.flapdoodle.embed.mongo</artifactId>
-            <groupId>de.flapdoodle.embed</groupId>
-            <scope>test</scope>
-            <version>2.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
-        </dependency>
+    <dependency>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-vintage-engine</artifactId>
+          <groupId>org.junit.vintage</groupId>
+        </exclusion>
+      </exclusions>
+      <groupId>org.springframework.boot</groupId>
+      <version>3.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <artifactId>persistence-api</artifactId>
+      <groupId>javax.persistence</groupId>
+      <version>1.0.2</version>
+    </dependency>
+    <dependency>
+      <artifactId>spring-boot-starter-data-mongodb</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <version>3.1.2</version>
+    </dependency>
+    <dependency>
+      <artifactId>de.flapdoodle.embed.mongo</artifactId>
+      <groupId>de.flapdoodle.embed</groupId>
+      <scope>test</scope>
+      <version>2.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.18.24</version>
+    </dependency>
 
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
-        </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>2.0.1.Final</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>3.0.0</version>
-        </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger2</artifactId>
+      <version>3.0.0</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-            <version>3.0.0</version>
-        </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-boot-starter</artifactId>
+      <version>3.0.0</version>
+    </dependency>
 
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>3.0.0</version>
-        </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger-ui</artifactId>
+      <version>3.0.0</version>
+    </dependency>
 
-        <dependency>
-            <groupId>au.com.dius.pact.provider</groupId>
-            <artifactId>junit5spring</artifactId>
-            <version>4.3.6</version>
-            <scope>test</scope>
-        </dependency>
+    <dependency>
+      <groupId>au.com.dius.pact.provider</groupId>
+      <artifactId>junit5spring</artifactId>
+      <version>4.3.6</version>
+      <scope>test</scope>
+    </dependency>
 
-    </dependencies>
+  </dependencies>
 
 
   <distributionManagement>
@@ -234,25 +234,25 @@
     </repository>
   </distributionManagement>
 
-    <description>Ecommerce Inventory</description>
-    <groupId>com.ecommerceapp</groupId>
-    <modelVersion>4.0.0</modelVersion>
-    <name>inventory</name>
-    <packaging>jar</packaging>
-    <parent>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <groupId>org.springframework.boot</groupId>
-        <relativePath/>
-        <version>2.3.2.RELEASE</version> <!-- lookup parent from com.ecommerceapp.shipment.repository -->
-    </parent>
+  <description>Ecommerce Inventory</description>
+  <groupId>com.ecommerceapp</groupId>
+  <modelVersion>4.0.0</modelVersion>
+  <name>inventory</name>
+  <packaging>jar</packaging>
+  <parent>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <groupId>org.springframework.boot</groupId>
+    <relativePath/>
+    <version>2.3.2.RELEASE</version> <!-- lookup parent from com.ecommerceapp.shipment.repository -->
+  </parent>
 
-    <properties>
-        <java.version>11</java.version>
-        <sonar.coverage.jacoco.xmlReportPaths>
-            ${project.basedir}/../inventory/target/site/jacoco/jacoco.xml
-        </sonar.coverage.jacoco.xmlReportPaths>
-    </properties>
+  <properties>
+    <java.version>11</java.version>
+    <sonar.coverage.jacoco.xmlReportPaths>
+      ${project.basedir}/../inventory/target/site/jacoco/jacoco.xml
+    </sonar.coverage.jacoco.xmlReportPaths>
+  </properties>
 
-    <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.1-SNAPSHOT</version>
 
 </project>
\ No newline at end of file
diff --git a/shipment/pom.xml b/shipment/pom.xml
index e6df597..f4629be 100644
--- a/shipment/pom.xml
+++ b/shipment/pom.xml
@@ -34,7 +34,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>2.35.0</version>
                 <executions>
                     <execution>
                         <id>apply</id>
@@ -283,6 +283,11 @@
             <artifactId>junit5</artifactId>
             <version>4.3.6</version>
         </dependency>
+      <dependency>
+        <groupId>joda-time</groupId>
+        <artifactId>joda-time</artifactId>
+        <version>2.10.5</version>
+      </dependency>
 
     </dependencies>
 
diff --git a/shipment/src/main/java/com/ecommerceapp/shipment/domain/OrderShipment.java b/shipment/src/main/java/com/ecommerceapp/shipment/domain/OrderShipment.java
index bc1975d..7d6ffac 100644
--- a/shipment/src/main/java/com/ecommerceapp/shipment/domain/OrderShipment.java
+++ b/shipment/src/main/java/com/ecommerceapp/shipment/domain/OrderShipment.java
@@ -2,11 +2,11 @@
 
 import com.ecommerceapp.domain.Order;
 import io.swagger.annotations.ApiModelProperty;
-import java.time.LocalDate;
 import java.util.Date;
 import javax.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
+import org.joda.time.LocalDate;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.mongodb.core.mapping.Document;
diff --git a/shipment/src/main/java/com/ecommerceapp/shipment/service/ShipmentService.java b/shipment/src/main/java/com/ecommerceapp/shipment/service/ShipmentService.java
index ab6930b..98a0673 100644
--- a/shipment/src/main/java/com/ecommerceapp/shipment/service/ShipmentService.java
+++ b/shipment/src/main/java/com/ecommerceapp/shipment/service/ShipmentService.java
@@ -6,12 +6,12 @@
 import com.ecommerceapp.shipment.repository.OrderShipmentRepository;
 import com.ecommerceapp.shipment.service.kafka.MessageListenerShipment;
 import com.github.javafaker.Faker;
-import java.time.LocalDate;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/shipment/src/test/java/com/ecommerceapp/shipment/unit/controller/ShipmentControllerTest.java b/shipment/src/test/java/com/ecommerceapp/shipment/unit/controller/ShipmentControllerTest.java
index 52b7749..8395b68 100644
--- a/shipment/src/test/java/com/ecommerceapp/shipment/unit/controller/ShipmentControllerTest.java
+++ b/shipment/src/test/java/com/ecommerceapp/shipment/unit/controller/ShipmentControllerTest.java
@@ -14,9 +14,9 @@
 import com.ecommerceapp.shipment.domain.Location;
 import com.ecommerceapp.shipment.domain.OrderShipment;
 import com.ecommerceapp.shipment.service.ShipmentService;
-import java.time.LocalDate;
 import java.util.List;
 import java.util.NoSuchElementException;
+import org.joda.time.LocalDate;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/shipment/src/test/java/com/ecommerceapp/shipment/unit/repository/OrderShipmentRepositoryTest.java b/shipment/src/test/java/com/ecommerceapp/shipment/unit/repository/OrderShipmentRepositoryTest.java
index 470212e..9244017 100644
--- a/shipment/src/test/java/com/ecommerceapp/shipment/unit/repository/OrderShipmentRepositoryTest.java
+++ b/shipment/src/test/java/com/ecommerceapp/shipment/unit/repository/OrderShipmentRepositoryTest.java
@@ -6,9 +6,9 @@
 import com.ecommerceapp.shipment.domain.Location;
 import com.ecommerceapp.shipment.domain.OrderShipment;
 import com.ecommerceapp.shipment.repository.OrderShipmentRepository;
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
+import org.joda.time.LocalDate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/shipment/src/test/java/com/ecommerceapp/shipment/unit/service/ShipmentServiceTest.java b/shipment/src/test/java/com/ecommerceapp/shipment/unit/service/ShipmentServiceTest.java
index ca24431..743b16b 100644
--- a/shipment/src/test/java/com/ecommerceapp/shipment/unit/service/ShipmentServiceTest.java
+++ b/shipment/src/test/java/com/ecommerceapp/shipment/unit/service/ShipmentServiceTest.java
@@ -11,9 +11,9 @@
 import com.ecommerceapp.shipment.repository.OrderShipmentRepository;
 import com.ecommerceapp.shipment.service.ShipmentService;
 import com.ecommerceapp.shipment.service.kafka.MessageListenerShipment;
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
+import org.joda.time.LocalDate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/shop/pom.xml b/shop/pom.xml
index 9f034b2..d81bbab 100644
--- a/shop/pom.xml
+++ b/shop/pom.xml
@@ -8,7 +8,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>2.35.0</version>
                 <executions>
                     <execution>
                         <id>apply</id>