Skip to content

Commit 565258d

Browse files
committed
Bring Spring up to supported versions.
Also explicitly setting Jacoco to a version.
1 parent 751b53d commit 565258d

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

buildSrc/src/main/kotlin/com/mattbertolini/buildlogic/java-conventions.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ tasks.named<Javadoc>("javadoc").configure {
5656
}
5757
}
5858

59+
val jacocoVersion: String = versionCatalog.findVersion("jacoco").orElseThrow().toString()
60+
configure<JacocoPluginExtension> {
61+
toolVersion = jacocoVersion
62+
}
63+
5964
tasks.named<JacocoReport>("jacocoTestReport").configure {
6065
reports {
6166
xml.required.set(true)

libs.versions.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
[versions]
2-
spring = "5.3.27" # Used in java-conventions.gradle.kts
3-
springBoot = "2.4.13" # Used in java-conventions.gradle.kts
2+
spring = "5.3.28" # Used in java-conventions.gradle.kts
3+
springBoot = "2.7.13" # Used in java-conventions.gradle.kts
44
junit = "5.9.3" # Used in java-conventions.gradle.kts
5+
jacoco = "0.8.10" # Used in java-conventions.gradle.kts
56

67
[libraries]
7-
javaxServletApi = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" }
8+
javaxServletApi = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" }
89
javaxValidationApi = { module = "javax.validation:validation-api", version = "2.0.1.Final" }
910

1011
findbugsJsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }

0 commit comments

Comments
 (0)