From 2b85cb03566b88d616fa51d970be6425c4d454d1 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Thu, 1 Feb 2024 10:12:33 +0000
Subject: [PATCH] Stop managing version of commons-compress where it isn't
 needed

Closes gh-39367
---
 gradle.properties                                          | 1 +
 spring-boot-project/spring-boot-parent/build.gradle        | 7 -------
 .../spring-boot-buildpack-platform/build.gradle            | 2 +-
 .../spring-boot-gradle-plugin/build.gradle                 | 2 +-
 .../spring-boot-loader-tools/build.gradle                  | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 4a739e43a36..718ab5b766f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 
 assertjVersion=3.24.2
 commonsCodecVersion=1.15
+commonsCompressVersion=1.21
 hamcrestVersion=2.2
 jacksonVersion=2.15.3
 junitJupiterVersion=5.9.3
diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle
index 48b8d88b3b6..2e8a3a3315e 100644
--- a/spring-boot-project/spring-boot-parent/build.gradle
+++ b/spring-boot-project/spring-boot-parent/build.gradle
@@ -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 = [
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle
index d6b393c6819..0e448630278 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle
@@ -22,7 +22,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")
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
index 48e174123a4..6abef56e5b0 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
@@ -34,7 +34,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")
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
index c6b18731707..738f5333382 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
@@ -20,7 +20,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")