Replace manual spring-data version to spring-data-bom (#139)

naver · Apr 8, 2024 · 3e1d8a6 · 3e1d8a6
1 parent ed9ee5c
commit 3e1d8a6
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 37 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,7 +44,11 @@ subprojects {
 
     dependencyManagement {
         imports {
-            mavenBom SpringBootPlugin.BOM_COORDINATES
+            mavenBom("${SpringBootPlugin.BOM_COORDINATES}") {
+                bomProperties([
+                        'spring-data-bom.version': "${springDataBomVersion}"
+                ])
+            }
         }
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,3 @@
-springDataVersion=3.3.0-M2
-springDataCommonsVersion=3.3.0-M2
 springBootVersion=3.3.0-M2
+springDataBomVersion=2024.0.0-M2
 kotlinVersion=1.9.20
diff --git a/guide-projects/plus-repository-guide/build.gradle b/guide-projects/plus-repository-guide/build.gradle
@@ -6,9 +6,9 @@ dependencies {
     implementation("org.projectlombok:lombok")
     annotationProcessor("org.projectlombok:lombok")
 
-    implementation("org.springframework.data:spring-data-jdbc:${springDataVersion}")
-    implementation("org.springframework.data:spring-data-relational:${springDataVersion}")
-    implementation("org.springframework.data:spring-data-commons:${springDataCommonsVersion}")
+    implementation("org.springframework.data:spring-data-jdbc")
+    implementation("org.springframework.data:spring-data-relational")
+    implementation("org.springframework.data:spring-data-commons")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.projectlombok:lombok")

diff --git a/guide-projects/plus-sql-java-groovy-guide/build.gradle b/guide-projects/plus-sql-java-groovy-guide/build.gradle
@@ -40,15 +40,15 @@ dependencies {
     implementation('org.codehaus.groovy:groovy:3.0.13')
     implementation("com.h2database:h2")
 
-    implementation("org.springframework.data:spring-data-jdbc:${springDataVersion}")
-    implementation("org.springframework.data:spring-data-relational:${springDataVersion}")
-    implementation("org.springframework.data:spring-data-commons:${springDataCommonsVersion}")
+    implementation("org.springframework.data:spring-data-jdbc")
+    implementation("org.springframework.data:spring-data-relational")
+    implementation("org.springframework.data:spring-data-commons")
 
     implementation project(":spring-data-plus-sql-gen")
     annotationProcessor project(":spring-data-plus-sql-gen")
-    annotationProcessor("org.springframework.data:spring-data-jdbc:${springDataVersion}")
-    annotationProcessor("org.springframework.data:spring-data-relational:${springDataVersion}")
-    annotationProcessor("org.springframework.data:spring-data-commons:${springDataCommonsVersion}")
+    annotationProcessor("org.springframework.data:spring-data-jdbc")
+    annotationProcessor("org.springframework.data:spring-data-relational")
+    annotationProcessor("org.springframework.data:spring-data-commons")
 
     compileOnly("org.projectlombok:lombok")
     annotationProcessor("org.projectlombok:lombok")

diff --git a/guide-projects/plus-sql-java-kotlin-guide/build.gradle b/guide-projects/plus-sql-java-kotlin-guide/build.gradle
@@ -39,9 +39,9 @@ dependencies {
     implementation("org.projectlombok:lombok")
     annotationProcessor("org.projectlombok:lombok")
 
-    implementation("org.springframework.data:spring-data-jdbc:${springDataVersion}")
-    implementation("org.springframework.data:spring-data-relational:${springDataVersion}")
-    implementation("org.springframework.data:spring-data-commons:${springDataCommonsVersion}")
+    implementation("org.springframework.data:spring-data-jdbc")
+    implementation("org.springframework.data:spring-data-relational")
+    implementation("org.springframework.data:spring-data-commons")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.projectlombok:lombok")

diff --git a/guide-projects/plus-sql-kotlin-guide/build.gradle.kts b/guide-projects/plus-sql-kotlin-guide/build.gradle.kts
@@ -22,8 +22,6 @@ repositories {
 }
 
 dependencies {
-    val springDataVersion: String by rootProject.extra
-    val springDataCommonsVersion: String by rootProject.extra
 
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation(project(":spring-boot-starter-data-jdbc-plus-sql"))
@@ -32,9 +30,9 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("com.h2database:h2")
 
-    implementation("org.springframework.data:spring-data-jdbc:$springDataVersion")
-    implementation("org.springframework.data:spring-data-relational:$springDataVersion")
-    implementation("org.springframework.data:spring-data-commons:$springDataCommonsVersion")
+    implementation("org.springframework.data:spring-data-jdbc")
+    implementation("org.springframework.data:spring-data-relational")
+    implementation("org.springframework.data:spring-data-commons")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
 }

diff --git a/spring-boot-autoconfigure-data-jdbc-plus/build.gradle b/spring-boot-autoconfigure-data-jdbc-plus/build.gradle
@@ -6,9 +6,9 @@ dependencies {
     implementation project(":spring-data-jdbc-plus-sql")
     implementation project(":spring-data-jdbc-plus-repository")
 
-    implementation("org.springframework.data:spring-data-jdbc:$springDataVersion")
-    implementation("org.springframework.data:spring-data-relational:$springDataVersion")
-    implementation("org.springframework.data:spring-data-commons:$springDataCommonsVersion")
+    implementation("org.springframework.data:spring-data-jdbc")
+    implementation("org.springframework.data:spring-data-relational")
+    implementation("org.springframework.data:spring-data-commons")
     implementation("io.projectreactor:reactor-core")
 
     testImplementation("org.junit.jupiter:junit-jupiter")

diff --git a/spring-boot-starter-data-jdbc-plus-repository/build.gradle b/spring-boot-starter-data-jdbc-plus-repository/build.gradle
@@ -3,7 +3,7 @@ dependencies {
     api(project(":spring-boot-autoconfigure-data-jdbc-plus"))
     api("org.springframework.boot:spring-boot-starter-jdbc")
 
-    implementation("org.springframework.data:spring-data-jdbc:${springDataVersion}")
-    implementation("org.springframework.data:spring-data-relational:${springDataVersion}")
-    implementation("org.springframework.data:spring-data-commons:${springDataCommonsVersion}")
+    implementation("org.springframework.data:spring-data-jdbc")
+    implementation("org.springframework.data:spring-data-relational")
+    implementation("org.springframework.data:spring-data-commons")
 }
diff --git a/spring-boot-starter-data-jdbc-plus-sql/build.gradle b/spring-boot-starter-data-jdbc-plus-sql/build.gradle
@@ -3,7 +3,7 @@ dependencies {
     api(project(":spring-data-jdbc-plus-sql"))
     api("org.springframework.boot:spring-boot-starter-jdbc")
 
-    implementation("org.springframework.data:spring-data-jdbc:${springDataVersion}")
-    implementation("org.springframework.data:spring-data-relational:${springDataVersion}")
-    implementation("org.springframework.data:spring-data-commons:${springDataCommonsVersion}")
+    implementation("org.springframework.data:spring-data-jdbc")
+    implementation("org.springframework.data:spring-data-relational")
+    implementation("org.springframework.data:spring-data-commons")
 }
diff --git a/spring-data-jdbc-plus-repository/build.gradle b/spring-data-jdbc-plus-repository/build.gradle
@@ -1,9 +1,9 @@
 compileJava.dependsOn(processResources)
 
 dependencies {
-    api("org.springframework.data:spring-data-jdbc:${springDataVersion}")
-    api("org.springframework.data:spring-data-relational:${springDataVersion}")
-    api("org.springframework.data:spring-data-commons:${springDataCommonsVersion}")
+    api("org.springframework.data:spring-data-jdbc")
+    api("org.springframework.data:spring-data-relational")
+    api("org.springframework.data:spring-data-commons")
 
     testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("org.junit.jupiter:junit-jupiter-api")

diff --git a/spring-data-jdbc-plus-sql/build.gradle b/spring-data-jdbc-plus-sql/build.gradle
@@ -2,9 +2,9 @@ compileJava.dependsOn(processResources)
 
 dependencies {
     api(project(":spring-jdbc-plus-support"))
-    api("org.springframework.data:spring-data-jdbc:${springDataVersion}")
-    api("org.springframework.data:spring-data-relational:${springDataVersion}")
-    api("org.springframework.data:spring-data-commons:${springDataCommonsVersion}")
+    api("org.springframework.data:spring-data-jdbc")
+    api("org.springframework.data:spring-data-relational")
+    api("org.springframework.data:spring-data-commons")
 
     compileOnly("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
     compileOnly("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")

diff --git a/spring-data-plus-sql-gen/build.gradle b/spring-data-plus-sql-gen/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
     api(project(":spring-data-jdbc-plus-sql"))
 
-    api("org.springframework.data:spring-data-relational:${springDataVersion}")
-    api("org.springframework.data:spring-data-commons:${springDataCommonsVersion}")
+    api("org.springframework.data:spring-data-relational")
+    api("org.springframework.data:spring-data-commons")
     api("com.squareup:javapoet:1.12.1")
 
     testImplementation("org.junit.jupiter:junit-jupiter")