Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Commons Compress 1.27.1

Browse Source 
Closes gh-45898
This commit is contained in:
Andy Wilkinson
2025-06-12 09:19:34 +01:00
parent 27bf83fa6d
commit c6748144fb
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java
View File

@@ -579,7 +579,9 @@ abstract class AbstractBootArchiveIntegrationTests {
void defaultDirAndFileModesAreUsed() throws IOException {
BuildResult result = this.gradleBuild.build(this.taskName);
assertThat(result.task(":" + this.taskName).getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
try (ZipFile jarFile = new ZipFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])) {
try (ZipFile jarFile = ZipFile.builder()
.setFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])
.get()) {
Enumeration<ZipArchiveEntry> entries = jarFile.getEntries();
while (entries.hasMoreElements()) {
ZipArchiveEntry entry = entries.nextElement();
@@ -605,7 +607,9 @@ abstract class AbstractBootArchiveIntegrationTests {
"upgrading_version_8.html#unix_file_permissions_deprecated")
.build(this.taskName);
assertThat(result.task(":" + this.taskName).getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
try (ZipFile jarFile = new ZipFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])) {
try (ZipFile jarFile = ZipFile.builder()
.setFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])
.get()) {
Enumeration<ZipArchiveEntry> entries = jarFile.getEntries();
while (entries.hasMoreElements()) {
ZipArchiveEntry entry = entries.nextElement();

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java
View File

@@ -330,7 +330,7 @@ abstract class AbstractBootArchiveTests<T extends Jar & BootArchive> {
File archiveFile = this.task.getArchiveFile().get().getAsFile();
assertThat(Files.readAllBytes(archiveFile.toPath()))
.startsWith(new DefaultLaunchScript(null, properties).toByteArray());
try (ZipFile zipFile = new ZipFile(archiveFile)) {
try (ZipFile zipFile = ZipFile.builder().setFile(archiveFile).get()) {
assertThat(zipFile.getEntries().hasMoreElements()).isTrue();
}
try {
@@ -460,7 +460,7 @@ abstract class AbstractBootArchiveTests<T extends Jar & BootArchive> {
this.task.classpath(classpathDirectory);
executeTask();
File archivePath = this.task.getArchiveFile().get().getAsFile();
try (ZipFile zip = new ZipFile(archivePath)) {
try (ZipFile zip = ZipFile.builder().setFile(archivePath).get()) {
Enumeration<ZipArchiveEntry> entries = zip.getEntries();
while (entries.hasMoreElements()) {
ZipArchiveEntry entry = entries.nextElement();

1
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java
View File

@@ -80,6 +80,7 @@ public class PluginClasspathGradleBuild extends GradleBuild {
new File(pathOfJarContaining("org.jetbrains.kotlin.daemon.client.KotlinCompilerClient")),
new File(pathOfJarContaining(KotlinCompilerPluginSupportPlugin.class)),
new File(pathOfJarContaining(LanguageSettings.class)),
new File(pathOfJarContaining("org.apache.commons.io.Charsets")),
new File(pathOfJarContaining(ArchiveEntry.class)), new File(pathOfJarContaining(BuildRequest.class)),
new File(pathOfJarContaining(HttpClientConnectionManager.class)),
new File(pathOfJarContaining(HttpRequest.class)),