Merge pull request #245 from ghkdqhrbals/feature/ecr-token-refresh-sc…

…heduling [fix] change jdk version to match kafka
ghkdqhrbals · Nov 27, 2023 · ea0c3b3 · ea0c3b3
2 parents c4db29f + 8320de6
commit ea0c3b3
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/customer-service/src/main/java/com/example/orderservice/kafka/KafkaAdminConfig.java b/customer-service/src/main/java/com/example/orderservice/kafka/KafkaAdminConfig.java
@@ -4,12 +4,14 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.annotation.EnableKafka;
 import org.springframework.kafka.core.KafkaAdmin;
 
 import java.util.HashMap;
 import java.util.Map;
 
 @Configuration
+@EnableKafka
 public class KafkaAdminConfig {
 
     @Value("${spring.kafka.bootstrap-servers}")

diff --git a/customer-service/src/main/java/com/example/orderservice/kafka/KafkaConsumerConfig.java b/customer-service/src/main/java/com/example/orderservice/kafka/KafkaConsumerConfig.java
@@ -14,7 +14,6 @@
 import org.springframework.kafka.support.serializer.JsonDeserializer;
 
 @Slf4j
-@EnableKafka
 @Configuration
 public class KafkaConsumerConfig {
     @Value("${spring.kafka.bootstrap-servers}")

diff --git a/customer-service/src/main/java/com/example/orderservice/kafka/KafkaProducerConfig.java b/customer-service/src/main/java/com/example/orderservice/kafka/KafkaProducerConfig.java
@@ -15,7 +15,6 @@
 import java.util.Map;
 
 @Configuration
-@EnableKafka
 public class KafkaProducerConfig {
 
     @Value("${spring.kafka.bootstrap-servers}")

diff --git a/...user-service/src/main/java/com/example/shopuserservice/web/kafka/KafkaProducerConfig.java b/...user-service/src/main/java/com/example/shopuserservice/web/kafka/KafkaProducerConfig.java
@@ -18,7 +18,6 @@
 
 @Configuration
 @ConditionalOnProperty(value = "kafka.enabled", matchIfMissing = true)
-@EnableKafka
 public class KafkaProducerConfig {
 
     @Value("${spring.kafka.bootstrap-servers}")

diff --git a/spring-chatting-backend-server/Dockerfile b/spring-chatting-backend-server/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM openjdk:17-alpine
+FROM amazoncorretto:17-alpine3.16-jdk
 
 WORKDIR /null
 

diff --git a/spring-chatting-backend-server/build.gradle b/spring-chatting-backend-server/build.gradle
@@ -57,9 +57,9 @@ dependencies {
 	implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap', version: '4.0.0'
 	implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
 
-	implementation('io.opentelemetry:opentelemetry-api:1.22.0') {
-		force = true
-	}
+//	implementation('io.opentelemetry:opentelemetry-api:1.22.0') {
+//		force = true
+//	}
 	implementation 'org.springframework.boot:spring-boot-configuration-processor';
 	implementation 'org.springframework.kafka:spring-kafka'
 	implementation 'com.google.guava:guava:31.1-jre'
@@ -111,7 +111,7 @@ task generateDockerfile {
 			println "Latest Path: \${projectPath}${latestJarFile.absolutePath.replace(project.projectDir.absolutePath, '')}"
 			def dockerfileContent =
 """
-FROM openjdk:17-alpine
+FROM amazoncorretto:17-alpine3.16-jdk
 
 WORKDIR /${group}
 

diff --git a/...ng-chatting-backend-server/src/main/java/chatting/chat/web/kafka/KafkaConsumerConfig.java b/...ng-chatting-backend-server/src/main/java/chatting/chat/web/kafka/KafkaConsumerConfig.java
@@ -16,7 +16,6 @@
 import org.springframework.kafka.support.serializer.JsonDeserializer;
 
 @Slf4j
-@EnableKafka
 @Configuration
 @Profile("prod")
 public class KafkaConsumerConfig {