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

Don't close jar files early

Browse Source 
Update `JarFile` and related classes so that `close()` is not longer
called early.

Prior to this commit, we would always immediately close the underlying
jar file to prevent file locking issues with our build. This causes
issues on certain JVMs when they attempt to verify a signed jar.

The file lock issues have now been solved by returning a custom input
stream from `JarUrlConnection` which captures and delegates the close
method.

Fixes gh-29356
This commit is contained in:
Phillip Webb
2022-06-14 20:46:51 -07:00
parent 49b71005de
commit b42f056ddb
9 changed files with 158 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
View File

@@ -14,6 +14,8 @@ dependencies {
app project(path: ":spring-boot-project:spring-boot-dependencies", configuration: "mavenRepository")
app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository")
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-web", configuration: "mavenRepository")
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository")
app("org.bouncycastle:bcprov-jdk15on:1.70")
intTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
@@ -39,6 +41,18 @@ task buildApp(type: GradleBuild) {
tasks = ["build"]
}
task syncSignedJarUnpackAppSource(type: org.springframework.boot.build.SyncAppSource) {
sourceDirectory = file("spring-boot-loader-tests-signed-jar-unpack-app")
destinationDirectory = file("${buildDir}/spring-boot-loader-tests-signed-jar-unpack-app")
}
task buildSignedJarUnpackApp(type: GradleBuild) {
dependsOn syncSignedJarUnpackAppSource, syncMavenRepository
dir = "${buildDir}/spring-boot-loader-tests-signed-jar-unpack-app"
startParameter.buildCacheEnabled = false
tasks = ["build"]
}
intTest {
dependsOn buildApp
dependsOn buildApp, buildSignedJarUnpackApp
}