From 5f680ccac0e0afd0a7dc6039c9ea74553dfb48d3 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Tue, 6 Feb 2024 11:37:40 +0000
Subject: [PATCH] Revert "Stop managing version of commons-compress where it
 isn't needed"

This reverts commit 2b85cb03566b88d616fa51d970be6425c4d454d1.

See 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, 10 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 718ab5b766f..4a739e43a36 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,6 @@ 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 2e8a3a3315e..48b8d88b3b6 100644
--- a/spring-boot-project/spring-boot-parent/build.gradle
+++ b/spring-boot-project/spring-boot-parent/build.gradle
@@ -34,6 +34,13 @@ 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 0e448630278..d6b393c6819 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:$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")
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 6abef56e5b0..48e174123a4 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:$commonsCompressVersion")
+	implementation("org.apache.commons:commons-compress")
 	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 738f5333382..c6b18731707 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:$commonsCompressVersion")
+	api("org.apache.commons:commons-compress")
 	api("org.springframework:spring-core")
 
 	compileOnly("ch.qos.logback:logback-classic")