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

Merge branch '2.3.x' into 2.4.x

Browse Source 
Closes gh-25937
This commit is contained in:
Scott Frederick
2021-04-08 13:03:26 -05:00
parent 5aa1e683c0 0ad7f76263
commit 9108b81bb2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -80,7 +80,7 @@ public class ZipFileTarArchive implements TarArchive {
+ "' is not compatible with buildpacks; ensure jar file is valid and launch script is not enabled"); + "' is not compatible with buildpacks; ensure jar file is valid and launch script is not enabled");
} }
catch (IOException ex) { catch (IOException ex) {
throw new IllegalStateException("File is not readable", ex); throw new IllegalStateException("File '" + jarFile + "' is not readable", ex);
} }
} }
@@ -99,6 +99,7 @@ public class ZipFileTarArchive implements TarArchive {
tarEntry.setUserId(this.owner.getUid()); tarEntry.setUserId(this.owner.getUid());
tarEntry.setGroupId(this.owner.getGid()); tarEntry.setGroupId(this.owner.getGid());
tarEntry.setModTime(NORMALIZED_MOD_TIME); tarEntry.setModTime(NORMALIZED_MOD_TIME);
tarEntry.setMode(zipEntry.getUnixMode());
if (!zipEntry.isDirectory()) { if (!zipEntry.isDirectory()) {
tarEntry.setSize(zipEntry.getSize()); tarEntry.setSize(zipEntry.getSize());
} }

5
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/ZipFileTarArchiveTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
* Tests for {@link ZipFileTarArchive}. * Tests for {@link ZipFileTarArchive}.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Scott Frederick
*/ */
class ZipFileTarArchiveTests { class ZipFileTarArchiveTests {
@@ -75,6 +76,7 @@ class ZipFileTarArchiveTests {
assertThat(fileEntry.getLongUserId()).isEqualTo(123); assertThat(fileEntry.getLongUserId()).isEqualTo(123);
assertThat(fileEntry.getLongGroupId()).isEqualTo(456); assertThat(fileEntry.getLongGroupId()).isEqualTo(456);
assertThat(fileEntry.getSize()).isEqualTo(4); assertThat(fileEntry.getSize()).isEqualTo(4);
assertThat(fileEntry.getMode()).isEqualTo(0755);
assertThat(tarStream).hasContent("test"); assertThat(tarStream).hasContent("test");
} }
} }
@@ -85,6 +87,7 @@ class ZipFileTarArchiveTests {
zip.putArchiveEntry(dirEntry); zip.putArchiveEntry(dirEntry);
zip.closeArchiveEntry(); zip.closeArchiveEntry();
ZipArchiveEntry fileEntry = new ZipArchiveEntry("spring/boot"); ZipArchiveEntry fileEntry = new ZipArchiveEntry("spring/boot");
fileEntry.setUnixMode(0755);
zip.putArchiveEntry(fileEntry); zip.putArchiveEntry(fileEntry);
zip.write("test".getBytes(StandardCharsets.UTF_8)); zip.write("test".getBytes(StandardCharsets.UTF_8));
zip.closeArchiveEntry(); zip.closeArchiveEntry();