From 2eb5c1658d0ee6784d89ec0de5065c907bcba07e Mon Sep 17 00:00:00 2001 From: junhkang Date: Tue, 26 Mar 2024 09:33:43 +0900 Subject: [PATCH 01/13] Updated the imports in code of the single table inheritance pattern for Spring Boot 3.x #2825 Change javax library to jakarta --- .../src/main/java/com/iluwatar/entity/Car.java | 4 ++-- .../main/java/com/iluwatar/entity/Freighter.java | 4 ++-- .../src/main/java/com/iluwatar/entity/Train.java | 4 ++-- .../src/main/java/com/iluwatar/entity/Truck.java | 4 ++-- .../src/main/java/com/iluwatar/entity/Vehicle.java | 14 +++++++------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/single-table-inheritance/src/main/java/com/iluwatar/entity/Car.java b/single-table-inheritance/src/main/java/com/iluwatar/entity/Car.java index c8d3185fdce9..10e7fb2f12fd 100644 --- a/single-table-inheritance/src/main/java/com/iluwatar/entity/Car.java +++ b/single-table-inheritance/src/main/java/com/iluwatar/entity/Car.java @@ -1,7 +1,7 @@ package com.iluwatar.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/single-table-inheritance/src/main/java/com/iluwatar/entity/Freighter.java b/single-table-inheritance/src/main/java/com/iluwatar/entity/Freighter.java index ce35f3df37df..0c20aacefe1c 100644 --- a/single-table-inheritance/src/main/java/com/iluwatar/entity/Freighter.java +++ b/single-table-inheritance/src/main/java/com/iluwatar/entity/Freighter.java @@ -1,7 +1,7 @@ package com.iluwatar.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/single-table-inheritance/src/main/java/com/iluwatar/entity/Train.java b/single-table-inheritance/src/main/java/com/iluwatar/entity/Train.java index 10a74f36ac5a..d7bc226bea27 100644 --- a/single-table-inheritance/src/main/java/com/iluwatar/entity/Train.java +++ b/single-table-inheritance/src/main/java/com/iluwatar/entity/Train.java @@ -1,7 +1,7 @@ package com.iluwatar.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/single-table-inheritance/src/main/java/com/iluwatar/entity/Truck.java b/single-table-inheritance/src/main/java/com/iluwatar/entity/Truck.java index e389666e4dcc..26ae2724c7bc 100644 --- a/single-table-inheritance/src/main/java/com/iluwatar/entity/Truck.java +++ b/single-table-inheritance/src/main/java/com/iluwatar/entity/Truck.java @@ -1,7 +1,7 @@ package com.iluwatar.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/single-table-inheritance/src/main/java/com/iluwatar/entity/Vehicle.java b/single-table-inheritance/src/main/java/com/iluwatar/entity/Vehicle.java index 901a37705455..814894d64d28 100644 --- a/single-table-inheritance/src/main/java/com/iluwatar/entity/Vehicle.java +++ b/single-table-inheritance/src/main/java/com/iluwatar/entity/Vehicle.java @@ -1,12 +1,12 @@ package com.iluwatar.entity; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; From 5dec4f02ae78708155792475a09b23636e30d626 Mon Sep 17 00:00:00 2001 From: junhkang Date: Tue, 26 Mar 2024 11:11:56 +0900 Subject: [PATCH 02/13] add pom.xml --- single-table-inheritance/pom.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/single-table-inheritance/pom.xml b/single-table-inheritance/pom.xml index 159a683bea21..2bef8842e07a 100644 --- a/single-table-inheritance/pom.xml +++ b/single-table-inheritance/pom.xml @@ -10,12 +10,26 @@ single-table-inheritance - + + + + org.springframework.boot + spring-boot-dependencies + pom + 3.2.3 + import + + + org.springframework.boot spring-boot-starter-data-jpa + + jakarta.xml.bind + jakarta.xml.bind-api + com.h2database h2 From f1ed6ee9a3c9a6e389423baed292c02ee8412c43 Mon Sep 17 00:00:00 2001 From: junhkang Date: Wed, 27 Mar 2024 09:52:39 +0900 Subject: [PATCH 03/13] Updated the imports in code of the healthcheck pattern for SpringBoot 3.x Change javax library to jakarta and update maven dependency versions --- health-check/pom.xml | 23 ++++++++++++++++--- .../check/AsynchronousHealthChecker.java | 2 +- .../health/check/CpuHealthIndicator.java | 2 +- .../iluwatar/health/check/HealthCheck.java | 10 ++++---- .../health/check/HealthCheckRepository.java | 6 ++--- .../test/java/HealthCheckRepositoryTest.java | 4 ++-- 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/health-check/pom.xml b/health-check/pom.xml index b6f6ba2644f1..3fb07d14ee1b 100644 --- a/health-check/pom.xml +++ b/health-check/pom.xml @@ -36,14 +36,32 @@ health-check - + + + + org.springframework.boot + spring-boot-dependencies + pom + 3.2.3 + import + + + org.hibernate + hibernate-core + 6.4.4.Final + + + org.springframework.boot spring-boot-starter-web - + + jakarta.xml.bind + jakarta.xml.bind-api + org.springframework.boot @@ -105,7 +123,6 @@ test - diff --git a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java index 106a924cbb11..1fc4790ec3c6 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java +++ b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java @@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Supplier; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.actuate.health.Health; diff --git a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java index 0914c3807d66..b59754e006fd 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java +++ b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java @@ -5,7 +5,7 @@ import java.time.Instant; import java.util.HashMap; import java.util.Map; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/health-check/src/main/java/com/iluwatar/health/check/HealthCheck.java b/health-check/src/main/java/com/iluwatar/health/check/HealthCheck.java index 15c14488ae0b..528753ee035a 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/HealthCheck.java +++ b/health-check/src/main/java/com/iluwatar/health/check/HealthCheck.java @@ -1,10 +1,10 @@ package com.iluwatar.health.check; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import lombok.Data; /** diff --git a/health-check/src/main/java/com/iluwatar/health/check/HealthCheckRepository.java b/health-check/src/main/java/com/iluwatar/health/check/HealthCheckRepository.java index 64a0a4e93159..272cf46b2159 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/HealthCheckRepository.java +++ b/health-check/src/main/java/com/iluwatar/health/check/HealthCheckRepository.java @@ -1,8 +1,8 @@ package com.iluwatar.health.check; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.transaction.Transactional; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.transaction.Transactional; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/health-check/src/test/java/HealthCheckRepositoryTest.java b/health-check/src/test/java/HealthCheckRepositoryTest.java index 2508c126d9e4..8eb791438db8 100644 --- a/health-check/src/test/java/HealthCheckRepositoryTest.java +++ b/health-check/src/test/java/HealthCheckRepositoryTest.java @@ -3,8 +3,8 @@ import com.iluwatar.health.check.HealthCheck; import com.iluwatar.health.check.HealthCheckRepository; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; From ac4d529eb4d157b1c9d04408beafa00dbec699be Mon Sep 17 00:00:00 2001 From: junhkang Date: Wed, 27 Mar 2024 10:13:29 +0900 Subject: [PATCH 04/13] change order of imports to pass Checkstyle violations --- .../com/iluwatar/health/check/AsynchronousHealthChecker.java | 2 +- .../main/java/com/iluwatar/health/check/CpuHealthIndicator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java index 1fc4790ec3c6..eb8378e08d75 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java +++ b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java @@ -6,8 +6,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.function.Supplier; import jakarta.annotation.PreDestroy; +import java.util.function.Supplier; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.actuate.health.Health; diff --git a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java index b59754e006fd..2faa1ace4bcc 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java +++ b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java @@ -4,8 +4,8 @@ import java.lang.management.OperatingSystemMXBean; import java.time.Instant; import java.util.HashMap; -import java.util.Map; import jakarta.annotation.PostConstruct; +import java.util.Map; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; From ab31c4499221ce9c907bc532203f54e43e61a697 Mon Sep 17 00:00:00 2001 From: junhkang Date: Wed, 27 Mar 2024 10:28:14 +0900 Subject: [PATCH 05/13] change import order to pass lexicographical order test --- .../com/iluwatar/health/check/AsynchronousHealthChecker.java | 2 +- .../main/java/com/iluwatar/health/check/CpuHealthIndicator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java index eb8378e08d75..18f44ef38c5b 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java +++ b/health-check/src/main/java/com/iluwatar/health/check/AsynchronousHealthChecker.java @@ -1,12 +1,12 @@ package com.iluwatar.health.check; +import jakarta.annotation.PreDestroy; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import jakarta.annotation.PreDestroy; import java.util.function.Supplier; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java index 2faa1ace4bcc..28b7de10099f 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java +++ b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java @@ -3,8 +3,8 @@ import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; import java.time.Instant; -import java.util.HashMap; import jakarta.annotation.PostConstruct; +import java.util.HashMap; import java.util.Map; import lombok.Getter; import lombok.Setter; From 672b44a4fa13bd5e695a5d086160a0d672ace936 Mon Sep 17 00:00:00 2001 From: junhkang Date: Wed, 27 Mar 2024 10:40:31 +0900 Subject: [PATCH 06/13] change import order to pass CustomImportOrder warning --- .../main/java/com/iluwatar/health/check/CpuHealthIndicator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java index 28b7de10099f..5c9bc2dd7e7e 100644 --- a/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java +++ b/health-check/src/main/java/com/iluwatar/health/check/CpuHealthIndicator.java @@ -1,9 +1,9 @@ package com.iluwatar.health.check; +import jakarta.annotation.PostConstruct; import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; import java.time.Instant; -import jakarta.annotation.PostConstruct; import java.util.HashMap; import java.util.Map; import lombok.Getter; From 6c3bfdf5ceba7858cb195aee896a3a494f148e36 Mon Sep 17 00:00:00 2001 From: junhkang Date: Thu, 28 Mar 2024 09:45:59 +0900 Subject: [PATCH 07/13] Updated the maven imports of layers pattern for SpringBoot 3.2.4 --- layers/pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/layers/pom.xml b/layers/pom.xml index 425b8eaedc6f..d5abd9d600c0 100644 --- a/layers/pom.xml +++ b/layers/pom.xml @@ -34,6 +34,24 @@ layers layers layers + + + + + org.springframework.boot + spring-boot-dependencies + pom + 3.2.4 + import + + + org.hibernate + hibernate-core + 6.4.4.Final + + + + org.springframework.boot From 1d69e22afb539d7eb5eed0c719486499bdc46dbc Mon Sep 17 00:00:00 2001 From: junhkang Date: Thu, 28 Mar 2024 10:36:32 +0900 Subject: [PATCH 08/13] remove unused maven import --- layers/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/layers/pom.xml b/layers/pom.xml index d5abd9d600c0..6a769e08cc26 100644 --- a/layers/pom.xml +++ b/layers/pom.xml @@ -44,11 +44,6 @@ 3.2.4 import - - org.hibernate - hibernate-core - 6.4.4.Final - From f7ad21151ac1c48a73f77723960e7d06ac0bb070 Mon Sep 17 00:00:00 2001 From: junhkang Date: Mon, 1 Apr 2024 11:16:05 +0900 Subject: [PATCH 09/13] Updated the maven imports of api-gateway pattern for SpringBoot 3.2.4 #2822 --- .../java/com/iluwatar/api/gateway/ApiGateway.java | 2 +- api-gateway/pom.xml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java index 59fbe7ddd4fe..b7ab7b404963 100644 --- a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java +++ b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java @@ -24,7 +24,7 @@ */ package com.iluwatar.api.gateway; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml index 8270b16a9bc3..d7a9a9a3ba19 100644 --- a/api-gateway/pom.xml +++ b/api-gateway/pom.xml @@ -34,6 +34,17 @@ 4.0.0 api-gateway pom + + + + org.springframework.boot + spring-boot-dependencies + pom + 3.2.4 + import + + + image-microservice price-microservice From 484b699a7cb5ea9c3c4202325a8805d95b159cba Mon Sep 17 00:00:00 2001 From: junhkang Date: Mon, 1 Apr 2024 14:30:24 +0900 Subject: [PATCH 10/13] Flaky test in Thread Local Storage #2880 --- .../src/test/java/ThreadLocalTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/thread-local-storage/src/test/java/ThreadLocalTest.java b/thread-local-storage/src/test/java/ThreadLocalTest.java index 9a31e48a838c..0de7f0514906 100644 --- a/thread-local-storage/src/test/java/ThreadLocalTest.java +++ b/thread-local-storage/src/test/java/ThreadLocalTest.java @@ -57,15 +57,15 @@ public void withoutThreadLocal() throws InterruptedException { int threadSize = 2; ExecutorService executor = Executors.newFixedThreadPool(threadSize); - WithoutThreadLocal threadLocal = new WithoutThreadLocal(initialValue); for (int i = 0; i < threadSize; i++) { - executor.submit(threadLocal); + //Create independent thread + WithoutThreadLocal threadLocal = new WithoutThreadLocal(initialValue); + executor.submit(threadLocal); } executor.awaitTermination(3, TimeUnit.SECONDS); - List lines = outContent.toString().lines().toList(); - //Matches only first thread, the second has changed by first thread value - Assertions.assertFalse(lines.stream() + + Assertions.assertTrue(lines.stream() .allMatch(line -> line.endsWith(String.valueOf(initialValue)))); } From 4af5b5aedda6c5995db30afcbd423727c9a7050a Mon Sep 17 00:00:00 2001 From: junhkang Date: Mon, 1 Apr 2024 14:33:45 +0900 Subject: [PATCH 11/13] Rollback testing changes --- .../src/test/java/ThreadLocalTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/thread-local-storage/src/test/java/ThreadLocalTest.java b/thread-local-storage/src/test/java/ThreadLocalTest.java index 0de7f0514906..9a31e48a838c 100644 --- a/thread-local-storage/src/test/java/ThreadLocalTest.java +++ b/thread-local-storage/src/test/java/ThreadLocalTest.java @@ -57,15 +57,15 @@ public void withoutThreadLocal() throws InterruptedException { int threadSize = 2; ExecutorService executor = Executors.newFixedThreadPool(threadSize); + WithoutThreadLocal threadLocal = new WithoutThreadLocal(initialValue); for (int i = 0; i < threadSize; i++) { - //Create independent thread - WithoutThreadLocal threadLocal = new WithoutThreadLocal(initialValue); - executor.submit(threadLocal); + executor.submit(threadLocal); } executor.awaitTermination(3, TimeUnit.SECONDS); - List lines = outContent.toString().lines().toList(); - Assertions.assertTrue(lines.stream() + List lines = outContent.toString().lines().toList(); + //Matches only first thread, the second has changed by first thread value + Assertions.assertFalse(lines.stream() .allMatch(line -> line.endsWith(String.valueOf(initialValue)))); } From 5618aba4d88575ccc987fd0da4fc6a737cde6b59 Mon Sep 17 00:00:00 2001 From: junhkang Date: Mon, 1 Apr 2024 14:36:46 +0900 Subject: [PATCH 12/13] Flaky test in Thread Local Storage #2880 Create independent threadLocal to make values unsharable and unchangable by other thread --- .../src/test/java/ThreadLocalTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/thread-local-storage/src/test/java/ThreadLocalTest.java b/thread-local-storage/src/test/java/ThreadLocalTest.java index 9a31e48a838c..0de7f0514906 100644 --- a/thread-local-storage/src/test/java/ThreadLocalTest.java +++ b/thread-local-storage/src/test/java/ThreadLocalTest.java @@ -57,15 +57,15 @@ public void withoutThreadLocal() throws InterruptedException { int threadSize = 2; ExecutorService executor = Executors.newFixedThreadPool(threadSize); - WithoutThreadLocal threadLocal = new WithoutThreadLocal(initialValue); for (int i = 0; i < threadSize; i++) { - executor.submit(threadLocal); + //Create independent thread + WithoutThreadLocal threadLocal = new WithoutThreadLocal(initialValue); + executor.submit(threadLocal); } executor.awaitTermination(3, TimeUnit.SECONDS); - List lines = outContent.toString().lines().toList(); - //Matches only first thread, the second has changed by first thread value - Assertions.assertFalse(lines.stream() + + Assertions.assertTrue(lines.stream() .allMatch(line -> line.endsWith(String.valueOf(initialValue)))); } From a4b15e9a7a27b10949be95f2de38d4e7bc7697b6 Mon Sep 17 00:00:00 2001 From: junhkang Date: Mon, 1 Apr 2024 14:40:24 +0900 Subject: [PATCH 13/13] rollback branch conflict --- .../java/com/iluwatar/api/gateway/ApiGateway.java | 2 +- api-gateway/pom.xml | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java index b7ab7b404963..59fbe7ddd4fe 100644 --- a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java +++ b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java @@ -24,7 +24,7 @@ */ package com.iluwatar.api.gateway; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml index d7a9a9a3ba19..8270b16a9bc3 100644 --- a/api-gateway/pom.xml +++ b/api-gateway/pom.xml @@ -34,17 +34,6 @@ 4.0.0 api-gateway pom - - - - org.springframework.boot - spring-boot-dependencies - pom - 3.2.4 - import - - - image-microservice price-microservice