diff --git a/build.gradle b/build.gradle index 7662ab6a..859f0873 100644 --- a/build.gradle +++ b/build.gradle @@ -143,7 +143,7 @@ subprojects { implementation 'org.springframework.boot:spring-boot-starter-data-redis' // Feign - implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:3.1.7' + implementation "org.springframework.cloud:spring-cloud-starter-openfeign:4.0.3" // Firebase implementation "com.google.firebase:firebase-admin:9.1.1" @@ -158,6 +158,12 @@ subprojects { } + dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:2022.0.3" + } + } + test { useJUnitPlatform() } diff --git a/motivoo-external/build.gradle b/motivoo-external/build.gradle index 1e62b716..d6ac9e88 100644 --- a/motivoo-external/build.gradle +++ b/motivoo-external/build.gradle @@ -5,8 +5,14 @@ dependencies { implementation project(":motivoo-common") // Social Login - implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:3.1.7' + implementation "org.springframework.cloud:spring-cloud-starter-openfeign:4.0.3" // for JsonIgnore implementation group: "io.jsonwebtoken", name: "jjwt-jackson", version: "0.11.2" +} + +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:2022.0.3" + } } \ No newline at end of file diff --git a/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/FeignClientConfig.java b/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/FeignClientConfig.java index 142b0637..3dda3e23 100644 --- a/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/FeignClientConfig.java +++ b/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/FeignClientConfig.java @@ -2,8 +2,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; +import sopt.org.motivoo.external.MotivooExternalRoot; + @Configuration -@EnableFeignClients(basePackageClasses = FeignClientConfig.class) +@EnableFeignClients(basePackageClasses = MotivooExternalRoot.class) public class FeignClientConfig { } \ No newline at end of file diff --git a/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/apple/service/AppleLoginService.java b/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/apple/service/AppleLoginService.java index 905d33fd..1476ac85 100644 --- a/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/apple/service/AppleLoginService.java +++ b/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/apple/service/AppleLoginService.java @@ -21,7 +21,7 @@ @Service public class AppleLoginService { - private AppleClient appleClient; + private final AppleClient appleClient; private final AppleJwtParser appleJwtParser; private final PublicKeyGenerator publicKeyGenerator; private final AppleClaimsValidator appleClaimsValidator;