root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Centralize dependency management of Commons Compress 

Closes gh-39368
This commit is contained in:
Andy Wilkinson 2024-11-04 10:31:31 +00:00
parent 90b920a410
commit a3168e3a2f
4 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-parent/build.gradle
View File

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

13
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle
View File

@ -19,17 +19,6 @@ configurations.all {
if (dependency.requested.group.equals("org.springframework")) {
dependency.useVersion("$springFramework60xVersion")
}
// We manage the version of commons-compress here rather than
// in spring-boot-parent to minimize conflicts with Testcontainers
if (dependency.requested.group.equals("org.apache.commons")
&& dependency.requested.name.equals("commons-compress")) {
dependency.useVersion("$commonsCompressVersion")
}
// Downgrade Testcontainers for compatibility with the managed
// version of Commons Compress.
if (dependency.requested.group.equals("org.testcontainers")) {
dependency.useVersion("1.19.3")
}
}
}
}
@ -38,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:$commonsCompressVersion")
api("org.apache.commons:commons-compress")
api("org.apache.httpcomponents.client5:httpclient5")
api("org.springframework:spring-core")
api("org.tomlj:tomlj:1.0.0")

13
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View File

@ -59,17 +59,6 @@ configurations {
if (dependency.requested.group.equals("org.springframework")) {
dependency.useVersion("$springFramework60xVersion")
}
// We manage the version of commons-compress here rather than
// in spring-boot-parent to minimize conflicts with Testcontainers
if (dependency.requested.group.equals("org.apache.commons")
&& dependency.requested.name.equals("commons-compress")) {
dependency.useVersion("$commonsCompressVersion")
}
// Downgrade Testcontainers for compatibility with the managed
// version of Commons Compress.
if (dependency.requested.group.equals("org.testcontainers")) {
dependency.useVersion("1.19.3")
}
}
}
}
@ -93,7 +82,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:$commonsCompressVersion")
implementation("org.apache.commons:commons-compress")
implementation("org.springframework:spring-core")
optional("org.graalvm.buildtools:native-gradle-plugin")

8
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
View File

@ -28,19 +28,13 @@ configurations {
if (dependency.requested.group.equals("org.springframework")) {
dependency.useVersion("$springFramework60xVersion")
}
// We manage the version of commons-compress here rather than
// in spring-boot-parent to minimize conflicts with Testcontainers
if (dependency.requested.group.equals("org.apache.commons")
&& dependency.requested.name.equals("commons-compress")) {
dependency.useVersion("$commonsCompressVersion")
}
}
}
}
}
dependencies {
api("org.apache.commons:commons-compress:$commonsCompressVersion")
api("org.apache.commons:commons-compress")
api("org.springframework:spring-core")
compileOnly("ch.qos.logback:logback-classic")