Skip to content

Commit 2b36c89

Browse files
committed
Remove some remnants of the embedded launch script support
See gh-47666
1 parent 81aa674 commit 2b36c89

File tree

5 files changed

+0
-51
lines changed

5 files changed

+0
-51
lines changed

build-plugin/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -306,21 +306,6 @@ void buildsImageWithTag() throws IOException {
306306
removeImages(projectName, "example.com/myapp:latest");
307307
}
308308

309-
@TestTemplate
310-
void buildsImageWithLaunchScript() throws IOException {
311-
writeMainClass();
312-
writeLongNameResource();
313-
BuildResult result = this.gradleBuild.build("bootBuildImage");
314-
String projectName = this.gradleBuild.getProjectDir().getName();
315-
BuildTask task = result.task(":bootBuildImage");
316-
assertThat(task).isNotNull();
317-
assertThat(task.getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
318-
assertThat(result.getOutput()).contains("docker.io/library/" + projectName);
319-
assertThat(result.getOutput()).contains("---> Test Info buildpack building");
320-
assertThat(result.getOutput()).contains("---> Test Info buildpack done");
321-
removeImages(projectName);
322-
}
323-
324309
@TestTemplate
325310
void buildsImageWithNetworkModeNone() throws IOException {
326311
writeMainClass();

build-plugin/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle

Lines changed: 0 additions & 29 deletions
This file was deleted.

build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AbstractArchiveIntegrationTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ protected String buildLog(File project) {
5353
return contentOf(new File(project, "target/build.log"));
5454
}
5555

56-
protected String launchScript(File jar) {
57-
String content = contentOf(jar);
58-
return content.substring(0, content.indexOf(new String(new byte[] { 0x50, 0x4b, 0x03, 0x04 })));
59-
}
60-
6156
protected AssertProvider<JarAssert> jar(File file) {
6257
return new AssertProvider<>() {
6358

build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ void whenJarIsRepackagedInPlaceOnlyRepackagedJarIsInstalled(MavenBuild mavenBuil
5757
File original = new File(project, "target/jar-0.0.1.BUILD-SNAPSHOT.jar.original");
5858
assertThat(original).isFile();
5959
File repackaged = new File(project, "target/jar-0.0.1.BUILD-SNAPSHOT.jar");
60-
assertThat(launchScript(repackaged)).isEmpty();
6160
assertThat(jar(repackaged)).manifest((manifest) -> {
6261
manifest.hasMainClass("org.springframework.boot.loader.launch.JarLauncher");
6362
manifest.hasStartClass("some.random.Main");

config/checkstyle/checkstyle-suppressions.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
<suppress files="ValidatorPropertiesWithDefaultValues\.java" checks="SpringMethodVisibility" />
6161
<suppress files="DevToolsTestApplication\.java" checks="SpringMethodVisibility" />
6262
<suppress files="DevToolsR2dbcAutoConfigurationTests" checks="HideUtilityClassConstructor" />
63-
<suppress files="AbstractLaunchScriptIntegrationTests" checks="IllegalImport" />
6463
<suppress files="FailureAnalyzers\.java" checks="RedundantModifier" />
6564
<suppress files="SpringBootVersion" checks="JavadocPackage" />
6665
<suppress files="SpringBootProviderVersion" checks="JavadocPackage" />

0 commit comments

Comments
 (0)