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

Merge branch '3.2.x' 

See gh-39369
This commit is contained in:
Andy Wilkinson 2024-02-06 12:38:37 +00:00
parent 22de896339 84e390af70
commit 9a5b3b3a2b
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gradle.properties
View File

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

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

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

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

@ -27,7 +27,7 @@ dependencies {
api("com.fasterxml.jackson.core:jackson-databind") api("com.fasterxml.jackson.core:jackson-databind")
api("com.fasterxml.jackson.module:jackson-module-parameter-names") api("com.fasterxml.jackson.module:jackson-module-parameter-names")
api("net.java.dev.jna:jna-platform") 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.apache.httpcomponents.client5:httpclient5")
api("org.springframework:spring-core") api("org.springframework:spring-core")
api("org.tomlj:tomlj:1.0.0") api("org.tomlj:tomlj:1.0.0")

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
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-buildpack-platform"))
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")) implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
implementation("io.spring.gradle:dependency-management-plugin") 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") implementation("org.springframework:spring-core")
optional("org.graalvm.buildtools:native-gradle-plugin") optional("org.graalvm.buildtools:native-gradle-plugin")

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

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