Skip to content

Commit ccd1ec0

Browse files
authored
Simplify dependency versions defined in spring-boot-dependencies (#3604)
1 parent 4fd88d5 commit ccd1ec0

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

dependencies.gradle

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,17 @@ versions.bouncyCastleFipsVersion = "2.1.1"
99
versions.bouncyCastlePkixFipsVersion = "2.1.9"
1010
versions.bouncyCastleTlsFipsVersion = "2.1.20"
1111
versions.springBootVersion = "3.5.5"
12-
versions.springFrameworkVersion = "6.2.10"
13-
versions.springSecurityVersion = "6.5.3"
1412
versions.tomcatCargoVersion = "10.1.44"
1513
versions.guavaVersion = "33.4.8-jre"
1614
versions.seleniumVersion = "4.35.0"
1715
versions.braveVersion = "6.3.0"
18-
versions.jacksonVersion = "2.19.2"
1916
versions.opensaml = "4.0.1"
20-
versions.byteBuddyVersion = "1.17.7"
2117

2218
// Versions we're overriding from the Spring Boot Bom (Dependabot does not issue PRs to bump these versions, so we need to manually bump them)
2319
ext["mariadb.version"] = "2.7.12" // Bumping to v3 breaks some pipeline jobs (and compatibility with Amazon Aurora MySQL), so pinning to v2 for now. v2 (current version) is stable and will be supported until about September 2025 (https://mariadb.com/kb/en/about-mariadb-connector-j/).
2420
ext["flyway.version"] = "7.15.0" // the next major (v8)'s community edition drops support with MySQL 5.7, which UAA still needs to support. Can bump to v8 once we solve this issue.
25-
ext["snakeyaml.version"] = "2.4" // manual update, see because of missing in spring boot https://github.com/spring-projects/spring-boot/issues/32221
26-
ext["jackson-bom.version"] = "${versions.jacksonVersion}" // Bumping to latest version because of compatiblity to snakeyaml 2.0
2721
ext["hsqldb.version"] = "2.7.4" // HSQL-DB used for tests but not supported for productive usage
2822
ext["selenium.version"] = "${versions.seleniumVersion}" // Selenium for integration tests only
29-
ext["spring-framework.version"] = "${versions.springFrameworkVersion}" // Maintain spring until upgrade to spring boot 3.x, https://github.com/cloudfoundry/uaa/issues/2115
30-
ext["spring-security.version"] = "${versions.springSecurityVersion}" // Maintain spring until upgrade to spring boot 3.x, https://github.com/cloudfoundry/uaa/issues/2115
3123
ext["tomcat.version"] = "${versions.tomcatCargoVersion}" // Maintain tomcat until upgrade to spring boot 3.x, https://github.com/cloudfoundry/uaa/issues/2115
3224

3325
ext {
@@ -57,9 +49,9 @@ libraries.guavaTestLib = "com.google.guava:guava-testlib:${versions.guavaVersion
5749
libraries.hamcrest = "org.hamcrest:hamcrest"
5850
libraries.hibernateValidator = "org.hibernate.validator:hibernate-validator"
5951
libraries.hsqldb = "org.hsqldb:hsqldb"
60-
libraries.jacksonAnnotations = "com.fasterxml.jackson.core:jackson-annotations:${versions.jacksonVersion}"
61-
libraries.jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:${versions.jacksonVersion}"
62-
libraries.jacksonDataformatYaml = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jacksonVersion}"
52+
libraries.jacksonAnnotations = "com.fasterxml.jackson.core:jackson-annotations"
53+
libraries.jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind"
54+
libraries.jacksonDataformatYaml = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
6355
libraries.jakartaValidationApi = "jakarta.validation:jakarta.validation-api"
6456
libraries.jacocoAgent = "org.jacoco:org.jacoco.agent:0.8.13"
6557
libraries.jodaTime = "joda-time:joda-time:2.14.0"
@@ -73,12 +65,12 @@ libraries.log4jCore = "org.apache.logging.log4j:log4j-core"
7365
libraries.lombok = "org.projectlombok:lombok"
7466
libraries.mariaJdbcDriver = "org.mariadb.jdbc:mariadb-java-client"
7567
libraries.mockitoJunit5 = "org.mockito:mockito-junit-jupiter"
76-
libraries.bytebuddy = "net.bytebuddy:byte-buddy:${versions.byteBuddyVersion}"
77-
libraries.bytebuddyagent = "net.bytebuddy:byte-buddy-agent:${versions.byteBuddyVersion}"
68+
libraries.bytebuddy = "net.bytebuddy:byte-buddy"
69+
libraries.bytebuddyagent = "net.bytebuddy:byte-buddy-agent"
7870
libraries.openSamlApi = "org.opensaml:opensaml-saml-api:${versions.opensaml}"
7971
libraries.orgJson = "org.json:json:20250517"
8072
libraries.passay = "org.passay:passay:1.6.6"
81-
libraries.postgresql = "org.postgresql:postgresql:42.7.7"
73+
libraries.postgresql = "org.postgresql:postgresql"
8274
libraries.selenium = "org.seleniumhq.selenium:selenium-java:${versions.seleniumVersion}"
8375
libraries.seleniumRemoteDriver = "org.seleniumhq.selenium:selenium-remote-driver:${versions.seleniumVersion}"
8476
libraries.slf4jApi = "org.slf4j:slf4j-api"
@@ -110,7 +102,7 @@ libraries.springTx = "org.springframework:spring-tx"
110102
libraries.springWeb = "org.springframework:spring-web"
111103
libraries.springWebMvc = "org.springframework:spring-webmvc"
112104
libraries.statsdClient = "com.timgroup:java-statsd-client:3.1.0"
113-
libraries.thymeleafDialect = "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.4.0" // bumped to 3.4.0 in spring boot 3.5.0
105+
libraries.thymeleafDialect = "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
114106
libraries.thymeleafExtrasSpringSecurity = "org.thymeleaf.extras:thymeleaf-extras-springsecurity6"
115107
libraries.thymeLeaf = "org.thymeleaf:thymeleaf"
116108
libraries.thymeleafSpring = "org.thymeleaf:thymeleaf-spring6"

0 commit comments

Comments
 (0)