Merge branch '3.1.x' into 3.2.x

Closes gh-39368
This commit is contained in:
Andy Wilkinson 2024-02-01 11:17:41 +00:00
commit 0afe0635b9
5 changed files with 4 additions and 10 deletions

View File

@ -6,6 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
assertjVersion=3.24.2
commonsCodecVersion=1.16.0
commonsCompressVersion=1.21
hamcrestVersion=2.2
jacksonVersion=2.15.3
junitJupiterVersion=5.10.1

View File

@ -34,13 +34,6 @@ bom {
]
}
}
library("Commons Compress", "1.21") {
group("org.apache.commons") {
modules = [
"commons-compress"
]
}
}
library("Commons FileUpload", "1.5") {
group("commons-fileupload") {
modules = [

View File

@ -27,7 +27,7 @@ dependencies {
api("com.fasterxml.jackson.core:jackson-databind")
api("com.fasterxml.jackson.module:jackson-module-parameter-names")
api("net.java.dev.jna:jna-platform")
api("org.apache.commons:commons-compress")
api("org.apache.commons:commons-compress:$commonsCompressVersion")
api("org.apache.httpcomponents.client5:httpclient5")
api("org.springframework:spring-core")
api("org.tomlj:tomlj:1.0.0")

View File

@ -39,7 +39,7 @@ dependencies {
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"))
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
implementation("io.spring.gradle:dependency-management-plugin")
implementation("org.apache.commons:commons-compress")
implementation("org.apache.commons:commons-compress:$commonsCompressVersion")
implementation("org.springframework:spring-core")
optional("org.graalvm.buildtools:native-gradle-plugin")

View File

@ -35,7 +35,7 @@ configurations {
}
dependencies {
api("org.apache.commons:commons-compress")
api("org.apache.commons:commons-compress:$commonsCompressVersion")
api("org.springframework:spring-core")
compileOnly("ch.qos.logback:logback-classic")