Finish moving to type-safe dependency notation

Author: mattbertolini

docs/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
     testImplementation(libs.assertJCore)
     testImplementation(libs.mockitoCore)
     testImplementation(libs.springTest)
-    testCompileOnly("org.hamcrest:hamcrest:2.2")
+    testCompileOnly(libs.hamcrest) // Needed for Spring mock MVC matchers
 }
 
 tasks.named<AsciidoctorTask>("asciidoctor").configure {

integration-tests/build.gradle.kts

@@ -6,14 +6,14 @@ dependencies {
     implementation(project(":spring-webmvc-annotated-data-binder"))
     implementation(project(":spring-webflux-annotated-data-binder"))
     implementation(libs.javaxServletApi)
-    implementation("org.hibernate.validator:hibernate-validator:6.0.19.Final")
-    implementation("org.glassfish:javax.el:3.0.1-b09")
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.11.2")
+    implementation(libs.hibernateValidator)
+    implementation(libs.glassfishJavaxEl) // Needed by Hibernate Validator
+    implementation(libs.jacksonDatabind)
 
     testImplementation(libs.junitJupiterApi)
     testImplementation(libs.assertJCore)
     testImplementation(libs.springTest)
-    testCompileOnly("org.hamcrest:hamcrest:2.2")
+    testCompileOnly(libs.hamcrest) // Needed for Spring mock MVC matchers
 }
 
 tasks.named<JavaCompile>("compileJava").configure {

libs.versions.toml

@@ -1,10 +1,11 @@
 [versions]
-spring = "5.3.13" # Used in java-conventions.gradle.kts
+spring = "5.3.27" # Used in java-conventions.gradle.kts
 springBoot = "2.4.13" # Used in java-conventions.gradle.kts
-junit = "5.6.1" # Used in java-conventions.gradle.kts
+junit = "5.9.3" # Used in java-conventions.gradle.kts
 
 [libraries]
 javaxServletApi = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" }
+javaxValidationApi = { module = "javax.validation:validation-api", version = "2.0.1.Final" }
 
 findbugsJsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
 
@@ -18,10 +19,15 @@ springWebmvc = { module = "org.springframework:spring-webmvc", version.ref = "sp
 springBootStarter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springBoot" }
 springBootTest = { module = "org.springframework.boot:spring-boot-test", version.ref = "springBoot" }
 
+glassfishJavaxEl = { module = "org.glassfish:javax.el", version = "3.0.1-b12" } # Needed by Hibernate Validator
+hibernateValidator = { module = "org.hibernate.validator:hibernate-validator", version = "6.0.21.Final" }
+jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version = "2.12.7.1" }
+
 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" }
+assertJCore = { module = "org.assertj:assertj-core", version = "3.24.2" }
+mockitoCore = { module = "org.mockito:mockito-core", version = "5.3.1" }
+equalsVerifier = { module = "nl.jqno.equalsverifier:equalsverifier", version = "3.14.2" }
+hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 
 [plugins]
 asciidoctor = { id = "org.asciidoctor.jvm.convert", version = "2.4.0" }

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

@@ -12,7 +12,7 @@ dependencies {
     testImplementation(libs.assertJCore)
     testImplementation(libs.mockitoCore)
     testImplementation(libs.springTest)
-    testImplementation("javax.validation:validation-api:2.0.1.Final")
+    testImplementation(libs.javaxValidationApi) // Used to test validation annotations
     testCompileOnly(libs.findbugsJsr305) // To Prevent warnings on missing enum constants
 }
 

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

@@ -13,7 +13,7 @@ dependencies {
     testImplementation(libs.assertJCore)
     testImplementation(libs.mockitoCore)
     testImplementation(libs.springTest)
-    testImplementation("javax.validation:validation-api:2.0.1.Final")
+    testImplementation(libs.javaxValidationApi) // Used to test validation annotations
     testCompileOnly(libs.findbugsJsr305) // To Prevent warnings on missing enum constants
 }