Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

develop에 병합 #324

Merged
merged 9 commits into from
Dec 10, 2024
5 changes: 4 additions & 1 deletion buildSrc/src/main/kotlin/AllOpen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,7 @@ object AllOpen {
/* usecase */
const val USECASE_WIHT_TRANSACTION = "com.goms.v2.common.annotation.UseCaseWithTransaction"
const val USECASE_WIHT_READONLY_TRANSACTION = "com.goms.v2.common.annotation.UseCaseWithReadOnlyTransaction"
}

/* configuration */
const val CONFIGURATION = "org.springframework.context.annotation.Configuration"
}
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/PluginVersions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ object PluginVersions {
const val SPRING_BOOT_VERSION = "2.7.5"
const val DEPENDENCY_MANAGER_VERSION = "1.1.0"
const val JVM_VERSION = "1.9.0"
const val SPRING_PLUGIN_VERSION = "1.7.22"
const val SPRING_PLUGIN_VERSION = "1.9.0"
const val JPA_PLUGIN_VERSION = "1.6.21"
const val ALL_OPEN_VERSION = "1.6.21"
const val ALL_OPEN_VERSION = "1.9.0"
const val KAPT_VERSION = "1.7.10"
}
1 change: 1 addition & 0 deletions goms-infrastructure/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ allOpen {
annotation(AllOpen.ENTITY)
annotation(AllOpen.MAPPED_SUPERCLASS)
annotation(AllOpen.EMBEDDABLE)
annotation(AllOpen.CONFIGURATION)
}

noArg {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ class AwsS3Config(

@Value("\${cloud.aws.region.static}")
private val region: String? = null

@Bean
fun amazonS3(): AmazonS3 {
val awsCredentials: AWSCredentials = BasicAWSCredentials(awsProperties.accessKey, awsProperties.secretKey)
return AmazonS3ClientBuilder.standard()
.withRegion(region)
.withCredentials(AWSStaticCredentialsProvider(awsCredentials))
.build()
.withRegion(region)
.withCredentials(AWSStaticCredentialsProvider(awsCredentials))
.build()
}
}
}
Loading