Spring Boot 버전 Up 에 따른 수정

Author: debop

build.gradle.kts

@@ -1,12 +1,10 @@
-import io.gitlab.arturbosch.detekt.detekt
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
     repositories {
         mavenCentral()
-        jcenter()
     }
     dependencies {
         classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${Versions.atomicfu}")
@@ -24,7 +22,7 @@ plugins {
     kotlin("plugin.noarg") version Versions.kotlin apply false
     kotlin("plugin.jpa") version Versions.kotlin apply false
 
-    id(BuildPlugins.detekt) version BuildPlugins.Versions.detekt apply false
+    //id(BuildPlugins.detekt) version BuildPlugins.Versions.detekt apply false
     id(BuildPlugins.dokka) version BuildPlugins.Versions.dokka apply false
     id(BuildPlugins.dependency_management) version BuildPlugins.Versions.dependency_management
     id(BuildPlugins.spring_boot) version BuildPlugins.Versions.spring_boot apply false
@@ -34,6 +32,7 @@ plugins {
 allprojects {
     repositories {
         mavenCentral()
+        google()
         jcenter()
     }
 }
@@ -49,7 +48,7 @@ subprojects {
         plugin("jacoco")
         plugin("maven-publish")
 
-        plugin("io.gitlab.arturbosch.detekt")
+        // plugin("io.gitlab.arturbosch.detekt")
         plugin("org.jetbrains.dokka")
         plugin("io.spring.dependency-management")
         plugin("maven-publish")
@@ -104,28 +103,28 @@ subprojects {
         }
     }
 
-    detekt {
-        description = "Runs a failfast detekt build."
-
-        input = files("src/main/kotlin")
-        config = files("${project.rootProject.rootDir}/detekt.yml")
-        filters = ".*/build/.*"
-
-        reports {
-            xml.enabled = false
-            html.enabled = true
-        }
-    }
+    //    detekt {
+    //        description = "Runs a failfast detekt build."
+    //
+    //        input = files("src/main/kotlin")
+    //        config = files("${project.rootProject.rootDir}/detekt.yml")
+    //        filters = ".*/build/.*"
+    //
+    //        reports {
+    //            xml.enabled = false
+    //            html.enabled = true
+    //        }
+    //    }
 
     // jacoco
     configure<JacocoPluginExtension> {
     }
 
     tasks.withType<JacocoReport> {
         reports {
-            html.isEnabled = true
-            xml.isEnabled = true
-            csv.isEnabled = false
+            html.required.set(true)
+            xml.required.set(true)
+            csv.required.set(false)
         }
     }
 
@@ -178,49 +177,6 @@ subprojects {
             dependency(Libraries.kryo)
             dependency(Libraries.kryo_serializers)
 
-            // Resilience4j
-            dependency(Libraries.resilience4j_annotations)
-            dependency(Libraries.resilience4j_bulkhead)
-            dependency(Libraries.resilience4j_circuitbreaker)
-            dependency(Libraries.resilience4j_core)
-            dependency(Libraries.resilience4j_framework_common)
-            dependency(Libraries.resilience4j_micrometer)
-            dependency(Libraries.resilience4j_ratelimiter)
-            dependency(Libraries.resilience4j_reactor)
-            dependency(Libraries.resilience4j_retry)
-            dependency(Libraries.resilience4j_spring)
-            dependency(Libraries.resilience4j_spring_boot2)
-            dependency(Libraries.resilience4j_spring_boot_common)
-
-            // Vavr
-            dependency(Libraries.vavr)
-            dependency(Libraries.vavr_jackson)
-            dependency(Libraries.vavr_kotlin)
-            dependency(Libraries.vavr_match)
-            dependency(Libraries.vavr_test)
-
-            // Netty
-            dependency(Libraries.netty_all)
-            dependency(Libraries.netty_common)
-            dependency(Libraries.netty_buffer)
-            dependency(Libraries.netty_codec)
-            dependency(Libraries.netty_codec_dns)
-            dependency(Libraries.netty_codec_http)
-            dependency(Libraries.netty_codec_http2)
-            dependency(Libraries.netty_codec_socks)
-            dependency(Libraries.netty_handler)
-            dependency(Libraries.netty_handler_proxy)
-            dependency(Libraries.netty_resolver)
-            dependency(Libraries.netty_resolver_dns)
-            dependency(Libraries.netty_transport)
-            dependency(Libraries.netty_transport_native_epoll)
-            dependency(Libraries.netty_transport_native_kqueue)
-
-            // Kafka
-            dependency(Libraries.kafka_clients)
-            dependency(Libraries.kafka_streams)
-            dependency(Libraries.kafka_streams_test_utils)
-
             // Jackson
             dependency(Libraries.jackson_annotations)
             dependency(Libraries.jackson_core)
@@ -235,76 +191,29 @@ subprojects {
             dependency(Libraries.jackson_module_kotlin)
             dependency(Libraries.jackson_module_afterburner)
 
-            // Micrometer
-            dependency(Libraries.micrometer_core)
-            dependency(Libraries.micrometer_test)
-            dependency(Libraries.micrometer_registry)
-            dependency(Libraries.micrometer_registry_prometheus)
-            dependency(Libraries.micrometer_registry_graphite)
-            dependency(Libraries.micrometer_registry_jmx)
-
             // Reactor
             dependency(Libraries.reactor_core)
-            dependency(Libraries.reactor_test)
+            dependency(Libraries.reactor_kotlin_extensions)
             dependency(Libraries.reactor_netty)
-
-            dependency(Libraries.rxjava2)
-            dependency(Libraries.rxkotlin)
-
-            dependency(Libraries.mongo_java_driver)
-            dependency(Libraries.mongo_bson)
-            dependency(Libraries.mongo_driver)
-            dependency(Libraries.mongo_driver_async)
-            dependency(Libraries.mongo_driver_core)
-            dependency(Libraries.mongo_driver_reactivestreams)
-
-            // Hibernate
-            dependency(Libraries.hibernate_core)
-            dependency(Libraries.hibernate_jpa_2_1_api)
-            dependency(Libraries.javassist)
-            dependency(Libraries.querydsl_apt)
-            dependency(Libraries.querydsl_jpa)
-
-            // Validators
-            dependency(Libraries.validation_api)
-            dependency(Libraries.hibernate_validator)
-            dependency(Libraries.hibernate_validator_annotation_processor)
-            dependency(Libraries.javax_el_api)
-            dependency(Libraries.javax_el)
+            dependency(Libraries.reactor_test)
 
             dependency(Libraries.hikaricp)
             dependency(Libraries.mysql_connector_java)
             dependency(Libraries.mariadb_java_client)
             dependency(Libraries.h2)
 
-            // Cache
-            dependency(Libraries.cache_api)
-            dependency(Libraries.cache2k_all)
-            dependency(Libraries.cache2k_spring)
-            dependency(Libraries.cache2k_jcache)
-
-            // Dagger
-            dependency(Libraries.dagger)
-            dependency(Libraries.dagger_compiler)
-
-            // Koin
-            dependency(Libraries.koin_core)
-            dependency(Libraries.koin_core_ext)
-            dependency(Libraries.koin_test)
-
-            // Metrics
-            dependency(Libraries.latencyUtils)
-            dependency(Libraries.hdrHistogram)
+            // Mongo Driver
+            dependency(Libraries.mongo_bson)
+            dependency(Libraries.mongo_driver_core)
+            dependency(Libraries.mongo_driver_sync)
+            dependency(Libraries.mongo_driver_reactivestreams)
 
             dependency(Libraries.byte_buddy)
             dependency(Libraries.byte_buddy_agent)
 
             dependency(Libraries.objenesis)
             dependency(Libraries.ow2_asm)
 
-            dependency(Libraries.random_beans)
-            dependency(Libraries.reflectasm)
-
             dependency(Libraries.junit_jupiter)
             dependency(Libraries.junit_jupiter_api)
             dependency(Libraries.junit_jupiter_engine)
@@ -327,11 +236,11 @@ subprojects {
 
     dependencies {
         val api by configurations
-        val compile by configurations
         val implementation by configurations
         val testImplementation by configurations
         val testRuntimeOnly by configurations
 
+        implementation(Libraries.kotlin_stdlib)
         implementation(Libraries.kotlin_stdlib_jdk8)
         implementation(Libraries.kotlin_reflect)
         testImplementation(Libraries.kotlin_test)
@@ -355,9 +264,9 @@ subprojects {
     }
 }
 
-dependencies {
-    // Make the root project archives configuration depend on every subproject
-    subprojects.forEach {
-        archives(it)
-    }
-}
+//dependencies {
+//    // Make the root project archives configuration depend on every subproject
+//    subprojects.forEach {
+//        archives(it)
+//    }
+//}

buildSrc/build.gradle.kts

@@ -1,5 +1,6 @@
 repositories {
-    jcenter()
+    mavenCentral()
+    google()
 }
 
 plugins {

buildSrc/src/main/kotlin/Libraries.kt

@@ -8,7 +8,7 @@ object BuildPlugins {
         const val protobuf = "0.8.13"
         const val avro = "0.17.0"
         const val jarTest = "1.0.1"
-        const val spring_boot = "2.4.2"
+        const val spring_boot = "2.5.4"
     }
 
     const val detekt = "io.gitlab.arturbosch.detekt"
@@ -29,12 +29,12 @@ object BuildPlugins {
 
 object Versions {
 
-    const val kotlin = "1.4.21"
-    const val kotlinx_coroutines = "1.4.2"
-    const val atomicfu = "0.14.4"
+    const val kotlin = "1.5.30"
+    const val kotlinx_coroutines = "1.5.2"
+    const val atomicfu = "0.15.1"
 
     const val spring_boot = BuildPlugins.Versions.spring_boot
-    const val spring_cloud = "2020.0.1"
+    const val spring_cloud = "2020.0.3"
     const val resilience4j = "1.7.0"
     const val vavr = "0.10.0"
     const val netty = "4.1.58.Final"
@@ -44,15 +44,15 @@ object Versions {
     const val krotoplus = "0.4.0"
     const val avro = "1.8.2"   // 1.9.0 은 jackson-dataformat-avro 에서 아직 지원하지 않습니다.
 
-    const val kafka = "2.2.1"
+    const val kafka = "2.8.1"
 
     const val jasync_sql = "1.0.6"
 
-    const val reactor = "3.4.2"
-    const val jackson = "2.11.3"
+    const val reactor = "3.4.10"
+    const val jackson = "2.12.5"
 
-    const val mongo_driver = "3.11.0"
-    const val lettuce = "5.1.8.RELEASE"
+    const val mongo_driver = "4.3.2"
+    const val lettuce = "6.1.5.RELEASE"
     const val redisson = "3.12.1"
 
     const val hibernate = "5.4.3.Final"
@@ -65,17 +65,17 @@ object Versions {
     const val slf4j = "1.7.26"
     const val logback = "1.2.3"
 
-    const val micrometer = "1.2.0"
+    const val micrometer = "1.7.4"
     const val cache2k = "1.2.3.Final"
 
     const val koin = "2.0.1"
 
     const val byte_buddy = "1.9.13"
 
-    const val junit_jupiter = "5.7.0"
-    const val junit_platform = "1.7.0"
+    const val junit_jupiter = "5.7.2"
+    const val junit_platform = "1.7.2"
     const val mockito = "3.0.0"
-    const val testcontainers = "1.15.1"
+    const val testcontainers = "1.16.0"
 }
 
 object Libraries {
@@ -246,7 +246,10 @@ object Libraries {
     // Reactor
     const val reactor_core = "io.projectreactor:reactor-core:${Versions.reactor}"
     const val reactor_test = "io.projectreactor:reactor-test:${Versions.reactor}"
-    const val reactor_netty = "io.projectreactor.netty:reactor-netty:1.0.1"
+
+    const val reactor_netty = "io.projectreactor.netty:reactor-netty:1.0.11"
+    const val reactor_kotlin_extensions = "io.projectreactor.kotlin:reactor-kotlin-extensions:1.1.4"
+
 
     // RxJava2
     const val rxjava2 = "io.reactivex.rxjava2:rxjava:2.2.10"
@@ -271,12 +274,10 @@ object Libraries {
     const val uuid_creator = "com.github.f4b6a3:uuid-creator:1.3.9"
 
     // MongoDB
-    const val mongo_java_driver = "org.mongodb:mongo-java-driver:${Versions.mongo_driver}"
     const val mongo_bson = "org.mongodb:bson:${Versions.mongo_driver}"
-    const val mongo_driver = "org.mongodb:mongodb-driver:${Versions.mongo_driver}"
-    const val mongo_driver_async = "org.mongodb:mongodb-driver-async:${Versions.mongo_driver}"
+    const val mongo_driver_sync = "org.mongodb:mongodb-driver-sync:${Versions.mongo_driver}"
     const val mongo_driver_core = "org.mongodb:mongodb-driver-core:${Versions.mongo_driver}"
-    const val mongo_driver_reactivestreams = "org.mongodb:mongodb-driver-reactivestreams:1.11.0"
+    const val mongo_driver_reactivestreams = "org.mongodb:mongodb-driver-reactivestreams:${Versions.mongo_driver}"
 
     // Redis
     const val lettuceCore = "io.lettuce:lettuce-core:${Versions.lettuce}"
@@ -356,8 +357,8 @@ object Libraries {
     const val junit_platform_commons = "org.junit.platform:junit-platform-commons:${Versions.junit_platform}"
     const val junit_platform_engine = "org.junit.platform:junit-platform-engine:${Versions.junit_platform}"
 
-    const val kluent = "org.amshove.kluent:kluent:1.64"
-    const val assertj_core = "org.assertj:assertj-core:3.19.0"
+    const val kluent = "org.amshove.kluent:kluent:1.68"
+    const val assertj_core = "org.assertj:assertj-core:3.20.2"
     const val mockk = "io.mockk:mockk:1.10.5"
     const val mockito_core = "org.mockito:mockito-core:${Versions.mockito}"
     const val mockito_junit_jupiter = "org.mockito:mockito-junit-jupiter:${Versions.mockito}"
@@ -372,6 +373,6 @@ object Libraries {
     const val testcontainers_cassandra = "org.testcontainers:cassandra:${Versions.testcontainers}"
     const val testcontainers_elasticsearch = "org.testcontainers:elasticsearch:${Versions.testcontainers}"
 
-    const val spring_kafka = "org.springframework.kafka:spring-kafka:2.2.8.RELEASE"
+    const val spring_kafka = "org.springframework.kafka:spring-kafka:2.7.7"
 
 }

eventsourcing/javers-mongodb-example/build.gradle.kts

@@ -7,11 +7,11 @@ dependencies {
     api(Libraries.javers_persistence_sql)
     api(Libraries.javers_spring_boot_starter_sql)
 
-    api(Libraries.mongo_driver)
+    api(Libraries.mongo_driver_core)
 
     api(Libraries.jackson_module_kotlin)
     api(Libraries.cache2k_core)
 
     api(project(":eventsourcing:javers-kotlin"))
-    testCompile(project(path = ":eventsourcing:javers-kotlin", configuration = "testArchives"))
+    testImplementation(project(path = ":eventsourcing:javers-kotlin", configuration = "testArchives"))
 }