Introduce a version catalog and start moving over to type-safe dependencies

Author: mattbertolini

build.gradle.kts

@@ -47,6 +47,7 @@ subprojects {
 //    sourceCompatibility = 1.8
 
     dependencies {
+        implementation(platform("org.springframework:spring-framework-bom:$springVersion"))
         implementation(platform("org.springframework:spring-framework-bom:$springVersion"))
         implementation(platform("javax.servlet:javax.servlet-api:3.1.0"))
         implementation(platform("com.google.code.findbugs:jsr305:3.0.2"))

integration-tests/build.gradle.kts

@@ -11,10 +11,10 @@ dependencies {
     implementation("org.glassfish:javax.el:3.0.1-b09")
     implementation("com.fasterxml.jackson.core:jackson-databind:2.11.2")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation(libs.junitJupiterApi)
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testImplementation("org.assertj:assertj-core")
-    testImplementation("org.springframework:spring-test")
+    testImplementation(libs.assertJCore)
+    testImplementation(libs.springTest)
     testCompileOnly("org.hamcrest:hamcrest") // Version defined in Spring BOM file
 }
 

libs.versions.toml

@@ -0,0 +1,23 @@
+[versions]
+spring = "5.3.13"
+springBoot = "2.4.13"
+junit = "5.6.1"
+
+[libraries]
+springFrameworkBom = { module = "org.springframework:spring-framework-bom", version.ref = "spring"}
+
+springBeans = { module = "org.springframework:spring-beans", version.ref = "spring" }
+springContext = { module = "org.springframework:spring-context", version.ref = "spring" }
+springTest = { module = "org.springframework:spring-test", version.ref = "spring" }
+springWeb = { module = "org.springframework:spring-web", version.ref = "spring" }
+springWebflux = { module = "org.springframework:spring-webflux", version.ref = "spring" }
+springWebmvc = { module = "org.springframework:spring-webmvc", version.ref = "spring" }
+
+springBootStarter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springBoot" }
+springBootTest = { module = "org.springframework.boot:spring-boot-test", version.ref = "springBoot" }
+
+junitBom = { module = "org.junit:junit-bom", version.ref = "junit" }
+junitJupiterApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
+assertJCore = { module = "org.assertj:assertj-core", version = "3.15.0" }
+mockitoCore = { module = "org.mockito:mockito-core", version = "3.3.3" }
+equalsVerifier = { module = "nl.jqno.equalsverifier:equalsverifier", version = "3.10" }

settings.gradle.kts

@@ -1,4 +1,13 @@
 rootProject.name = "spring-annotated-web-data-binder"
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        register("libs") {
+            from(files("libs.versions.toml"))
+        }
+    }
+}
+
 include("spring-annotated-data-binder-core")
 include("spring-webmvc-annotated-data-binder")
 include("spring-webflux-annotated-data-binder")

spring-annotated-data-binder-core/build.gradle.kts

@@ -4,18 +4,18 @@ plugins {
 }
 
 dependencies {
-    api("org.springframework:spring-context")
-    api("org.springframework:spring-beans")
-    api("org.springframework:spring-web")
+    api(libs.springContext)
+    api(libs.springBeans)
+    api(libs.springWeb)
     compileOnly("com.google.code.findbugs:jsr305")
     compileOnly("javax.servlet:javax.servlet-api") // So Javadoc doesn't give warnings about missing links
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testImplementation("org.assertj:assertj-core")
-    testImplementation("org.mockito:mockito-core")
-    testImplementation("org.springframework:spring-test")
-    testImplementation("nl.jqno.equalsverifier:equalsverifier")
+    testImplementation(libs.junitJupiterApi)
+//    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testImplementation(libs.assertJCore)
+    testImplementation(libs.mockitoCore)
+    testImplementation(libs.springTest)
+    testImplementation(libs.equalsVerifier)
 }
 
 tasks.jar {

spring-webflux-annotated-data-binder/build.gradle.kts

@@ -5,14 +5,14 @@ plugins {
 
 dependencies {
     api(project(":spring-annotated-data-binder-core"))
-    api("org.springframework:spring-webflux")
+    api(libs.springWebflux)
     compileOnly("com.google.code.findbugs:jsr305")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation(libs.junitJupiterApi)
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testImplementation("org.assertj:assertj-core")
-    testImplementation("org.mockito:mockito-core")
-    testImplementation("org.springframework:spring-test")
+    testImplementation(libs.assertJCore)
+    testImplementation(libs.mockitoCore)
+    testImplementation(libs.springTest)
     testCompileOnly("com.google.code.findbugs:jsr305")
     testImplementation("javax.validation:validation-api:2.0.1.Final")
 }

spring-webmvc-annotated-data-binder/build.gradle.kts

@@ -5,15 +5,15 @@ plugins {
 
 dependencies {
     api(project(":spring-annotated-data-binder-core"))
-    api("org.springframework:spring-webmvc")
+    api(libs.springWebmvc)
     implementation("javax.servlet:javax.servlet-api")
     compileOnly("com.google.code.findbugs:jsr305")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation(libs.junitJupiterApi)
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testImplementation("org.assertj:assertj-core")
-    testImplementation("org.mockito:mockito-core")
-    testImplementation("org.springframework:spring-test")
+    testImplementation(libs.assertJCore)
+    testImplementation(libs.mockitoCore)
+    testImplementation(libs.springTest)
     testImplementation("javax.validation:validation-api:2.0.1.Final")
     testCompileOnly("com.google.code.findbugs:jsr305")
 }