Skip to content

Commit 7a4c437

Browse files
committed
Upgrade to Commons Compress 1.27.1
Closes gh-45926
1 parent 5369e7a commit 7a4c437

File tree

6 files changed

+15
-10
lines changed

6 files changed

+15
-10
lines changed

spring-boot-project/spring-boot-parent/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ bom {
4747
]
4848
}
4949
}
50-
library("Commons Compress", "1.25.0") {
50+
library("Commons Compress", "1.27.1") {
5151
group("org.apache.commons") {
5252
modules = [
5353
"commons-compress"

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/ZipFileTarArchive.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public ZipFileTarArchive(File zip, Owner owner) {
6464
public void writeTo(OutputStream outputStream) throws IOException {
6565
TarArchiveOutputStream tar = new TarArchiveOutputStream(outputStream);
6666
tar.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
67-
try (ZipFile zipFile = new ZipFile(this.zip)) {
67+
try (ZipFile zipFile = ZipFile.builder().setFile(this.zip).get()) {
6868
Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
6969
while (entries.hasMoreElements()) {
7070
ZipArchiveEntry zipEntry = entries.nextElement();
@@ -75,7 +75,7 @@ public void writeTo(OutputStream outputStream) throws IOException {
7575
}
7676

7777
private void assertArchiveHasEntries(File file) {
78-
try (ZipFile zipFile = new ZipFile(file)) {
78+
try (ZipFile zipFile = ZipFile.builder().setFile(file).get()) {
7979
Assert.state(zipFile.getEntries().hasMoreElements(), () -> "Archive file '" + file + "' is not valid");
8080
}
8181
catch (IOException ex) {

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,9 @@ void javaVersionIsSetInManifest() throws IOException {
579579
void defaultDirAndFileModesAreUsed() throws IOException {
580580
BuildResult result = this.gradleBuild.build(this.taskName);
581581
assertThat(result.task(":" + this.taskName).getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
582-
try (ZipFile jarFile = new ZipFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])) {
582+
try (ZipFile jarFile = ZipFile.builder()
583+
.setFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])
584+
.get()) {
583585
Enumeration<ZipArchiveEntry> entries = jarFile.getEntries();
584586
while (entries.hasMoreElements()) {
585587
ZipArchiveEntry entry = entries.nextElement();
@@ -605,7 +607,9 @@ void dirModeAndFileModeAreApplied() throws IOException {
605607
"upgrading_version_8.html#unix_file_permissions_deprecated")
606608
.build(this.taskName);
607609
assertThat(result.task(":" + this.taskName).getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
608-
try (ZipFile jarFile = new ZipFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])) {
610+
try (ZipFile jarFile = ZipFile.builder()
611+
.setFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])
612+
.get()) {
609613
Enumeration<ZipArchiveEntry> entries = jarFile.getEntries();
610614
while (entries.hasMoreElements()) {
611615
ZipArchiveEntry entry = entries.nextElement();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ void launchScriptCanBePrepended() throws IOException {
330330
File archiveFile = this.task.getArchiveFile().get().getAsFile();
331331
assertThat(Files.readAllBytes(archiveFile.toPath()))
332332
.startsWith(new DefaultLaunchScript(null, properties).toByteArray());
333-
try (ZipFile zipFile = new ZipFile(archiveFile)) {
333+
try (ZipFile zipFile = ZipFile.builder().setFile(archiveFile).get()) {
334334
assertThat(zipFile.getEntries().hasMoreElements()).isTrue();
335335
}
336336
try {
@@ -460,7 +460,7 @@ void allEntriesUseUnixPlatformAndUtf8NameEncoding() throws IOException {
460460
this.task.classpath(classpathDirectory);
461461
executeTask();
462462
File archivePath = this.task.getArchiveFile().get().getAsFile();
463-
try (ZipFile zip = new ZipFile(archivePath)) {
463+
try (ZipFile zip = ZipFile.builder().setFile(archivePath).get()) {
464464
Enumeration<ZipArchiveEntry> entries = zip.getEntries();
465465
while (entries.hasMoreElements()) {
466466
ZipArchiveEntry entry = entries.nextElement();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ private List<File> pluginClasspath() {
9595
classpath.add(new File(pathOfJarContaining(KotlinCompilerPluginSupportPlugin.class)));
9696
classpath.add(new File(pathOfJarContaining(LanguageSettings.class)));
9797
}
98+
classpath.add(new File(pathOfJarContaining("org.apache.commons.io.Charsets")));
9899
classpath.add(new File(pathOfJarContaining(ArchiveEntry.class)));
99100
classpath.add(new File(pathOfJarContaining(BuildRequest.class)));
100101
classpath.add(new File(pathOfJarContaining(HttpClientConnectionManager.class)));

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void addLauncherScript() throws Exception {
162162
assertThat(new String(bytes)).startsWith("ABC");
163163
assertThat(hasLauncherClasses(source)).isFalse();
164164
assertThat(hasLauncherClasses(this.destination)).isTrue();
165-
try (ZipFile zipFile = new ZipFile(this.destination)) {
165+
try (ZipFile zipFile = ZipFile.builder().setFile(this.destination).get()) {
166166
assertThat(zipFile.getEntries().hasMoreElements()).isTrue();
167167
}
168168
try {
@@ -267,7 +267,7 @@ protected void execute(Repackager packager, Libraries libraries) throws IOExcept
267267
@Override
268268
protected Collection<ZipArchiveEntry> getAllPackagedEntries() throws IOException {
269269
List<ZipArchiveEntry> result = new ArrayList<>();
270-
try (ZipFile zip = new ZipFile(this.destination)) {
270+
try (ZipFile zip = ZipFile.builder().setFile(this.destination).get()) {
271271
Enumeration<ZipArchiveEntry> entries = zip.getEntries();
272272
while (entries.hasMoreElements()) {
273273
result.add(entries.nextElement());
@@ -285,7 +285,7 @@ protected Manifest getPackagedManifest() throws IOException {
285285

286286
@Override
287287
protected String getPackagedEntryContent(String name) throws IOException {
288-
try (ZipFile zip = new ZipFile(this.destination)) {
288+
try (ZipFile zip = ZipFile.builder().setFile(this.destination).get()) {
289289
ZipArchiveEntry entry = zip.getEntry(name);
290290
if (entry == null) {
291291
return null;

0 commit comments

Comments
 (0)