revert : upgrade to spring boot 2.4.0 (#888)

* revert : upgrade to spring boot 2.4.0 As kafka-streams are not working * revert spring opendoc
rajadilipkolli · Nov 18, 2024 · eac97fe · eac97fe
1 parent e9e3cc8
commit eac97fe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/order-service/pom.xml b/order-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.0-RC1</version>
+        <version>3.3.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.orderservice</groupId>
@@ -19,9 +19,9 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <java.version>21</java.version>
-        <spring-cloud.version>2024.0.0-RC1</spring-cloud.version>
+        <spring-cloud.version>2023.0.3</spring-cloud.version>
         <org-mapstruct.version>1.6.3</org-mapstruct.version>
-        <springdoc-openapi.version>2.7.0-RC1</springdoc-openapi.version>
+        <springdoc-openapi.version>2.6.0</springdoc-openapi.version>
 
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <spotless.version>2.43.0</spotless.version>

diff --git a/order-service/src/test/java/com/example/orderservice/TestOrderServiceApplication.java b/order-service/src/test/java/com/example/orderservice/TestOrderServiceApplication.java
@@ -16,9 +16,9 @@ Licensed under MIT License Copyright (c) 2023-2024 Raja Kolli.
 public class TestOrderServiceApplication {
 
     public static void main(String[] args) {
+        System.setProperty("spring.profiles.active", AppConstants.PROFILE_LOCAL);
         SpringApplication.from(OrderServiceApplication::main)
                 .with(ContainersConfig.class)
-                .withAdditionalProfiles(AppConstants.PROFILE_LOCAL)
                 .run(args);
     }
 }
diff --git a/order-service/src/test/java/com/example/orderservice/common/ContainersConfig.java b/order-service/src/test/java/com/example/orderservice/common/ContainersConfig.java
@@ -11,7 +11,7 @@ Licensed under MIT License Copyright (c) 2024 Raja Kolli.
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.kafka.KafkaContainer;
+import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
@@ -21,7 +21,8 @@ public class ContainersConfig {
     @ServiceConnection
     @RestartScope
     KafkaContainer kafkaContainer() {
-        return new KafkaContainer(DockerImageName.parse("apache/kafka-native").withTag("3.8.1"))
+        return new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("7.7.1"))
+                .withKraft()
                 .withReuse(true);
     }
 

diff --git a/order-service/src/test/java/com/example/orderservice/repositories/OrderRepositoryTest.java b/order-service/src/test/java/com/example/orderservice/repositories/OrderRepositoryTest.java
@@ -29,7 +29,7 @@ Licensed under MIT License Copyright (c) 2023-2024 Raja Kolli.
 @ActiveProfiles({PROFILE_TEST})
 @ImportTestcontainers(PostGreSQLContainer.class)
 @DataJpaTest(properties = {"spring.jpa.hibernate.ddl-auto=validate"})
-@AutoConfigureTestDatabase
+@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
 class OrderRepositoryTest {
 
     @Autowired private OrderRepository orderRepository;