Skip to content

Commit

Permalink
chore(dependency): upgrade spring boot to 2.5.15 and related cleanup (s…
Browse files Browse the repository at this point in the history
…pinnaker#1115)

Removed constraint of ch.qos.logback because spring boot 2.5.15 brings logback:1.2.12.

Removed platform dependency com.fasterxml.jackson:jackson-bom because spring boot 2.5.15 brings jackson:2.12.7.20221012

Groovy get transitively upgraded to 3.0.17

https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.5.15/spring-boot-dependencies-2.5.15.pom
  • Loading branch information
j-sandy authored Nov 13, 2023
1 parent 5403c6a commit 7bd9a47
Showing 1 changed file with 1 addition and 24 deletions.
25 changes: 1 addition & 24 deletions spinnaker-dependencies/spinnaker-dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ ext {
jooq : "3.13.6",
jsch : "0.1.54",
jschAgentProxy : "0.0.9",
// spring boot 2.5.14 specifies logback 1.2.11, but a rosco test hung with
// 1.2.11 from https://jira.qos.ch/browse/LOGBACK-1623 so pinning it to 1.2.12
// until spring boot upgrade 2.5.15 or above.
logback : "1.2.12",
protobuf : "3.21.12",
okhttp : "2.7.5", // CVE-2016-2402
okhttp3 : "4.9.3",
Expand All @@ -28,7 +24,7 @@ ext {
spectator : "1.0.6",
spek : "1.1.5",
spek2 : "2.0.9",
springBoot : "2.5.14",
springBoot : "2.5.15",
springCloud : "2020.0.6",
springfoxSwagger : "2.9.2",
swagger : "1.5.20", //this should stay in sync with what springfoxSwagger expects
Expand Down Expand Up @@ -58,7 +54,6 @@ dependencies {
//kotlinVersion comes from gradle.properties since we have kotlin code in
// this project and need to configure gradle plugins etc.
api(platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion"))
api(platform("com.fasterxml.jackson:jackson-bom:2.12.7.20221012"))
api(platform("io.zipkin.brave:brave-bom:${versions.brave}"))
api(platform("org.springframework.boot:spring-boot-dependencies:${versions.springBoot}"))
api(platform("com.amazonaws:aws-java-sdk-bom:${versions.aws}"))
Expand All @@ -75,24 +70,6 @@ dependencies {

constraints {
api("cglib:cglib-nodep:3.3.0")
//A bug is reported in 1.2.11 and fixed in 1.2.12.
//So pinning the version to 1.2.12 until spring boot upgrade to 2.5.15 or above.
//[https://jira.qos.ch/browse/LOGBACK-1623]
api("ch.qos.logback:logback-core"){
version {
strictly "${versions.logback}"
}
}
api("ch.qos.logback:logback-classic"){
version {
strictly "${versions.logback}"
}
}
api("ch.qos.logback:logback-access"){
version {
strictly "${versions.logback}"
}
}
api("com.amazonaws:aws-java-sdk:${versions.aws}")
api("com.google.api-client:google-api-client:1.30.10") // TODO: Track update for CVE-2020-7692, reanalysis pending.
api("com.google.apis:google-api-services-admin-directory:directory_v1-rev105-1.25.0")
Expand Down

0 comments on commit 7bd9a47

Please sign in to comment.