Rename spring-boot-loader to spring-boot-loader-classic

Rename the `spring-boot-loader` module to `spring-boot-loader-classic`
so that we can introduce an alternative loader implementation.

See gh-37669
This commit is contained in:
Phillip Webb
2023-09-18 13:41:31 -07:00
parent c22548982a
commit aeb6537f57
105 changed files with 67 additions and 67 deletions

View File

@@ -4,7 +4,7 @@ plugins {
id "org.springframework.boot.integration-test"
}
description = "Spring Boot Loader Integration Tests"
description = "Spring Boot Classic Loader Integration Tests"
configurations {
app
@@ -28,13 +28,13 @@ task syncMavenRepository(type: Sync) {
}
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
sourceDirectory = file("spring-boot-loader-tests-app")
destinationDirectory = file("${buildDir}/spring-boot-loader-tests-app")
sourceDirectory = file("spring-boot-loader-classic-tests-app")
destinationDirectory = file("${buildDir}/spring-boot-loader-classic-tests-app")
}
task buildApp(type: GradleBuild) {
dependsOn syncAppSource, syncMavenRepository
dir = "${buildDir}/spring-boot-loader-tests-app"
dir = "${buildDir}/spring-boot-loader-classic-tests-app"
startParameter.buildCacheEnabled = false
tasks = ["build"]
}

View File

@@ -71,7 +71,7 @@ class LoaderIntegrationTests {
}
private File findApplication() {
String name = String.format("build/%1$s/build/libs/%1$s.jar", "spring-boot-loader-tests-app");
String name = String.format("build/%1$s/build/libs/%1$s.jar", "spring-boot-loader-classic-tests-app");
File jar = new File(name);
Assert.state(jar.isFile(), () -> "Could not find " + name + ". Have you built it?");
return jar;

View File

@@ -30,7 +30,7 @@ dependencies {
antDependencies "org.apache.ant:ant-launcher:1.10.7"
antDependencies "org.apache.ant:ant:1.10.7"
testRepository(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader", configuration: "mavenRepository"))
testRepository(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-classic", configuration: "mavenRepository"))
testRepository(project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository"))
testImplementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))

View File

@@ -65,7 +65,7 @@
<fileset dir="${lib.dir}/runtime" />
<globmapper from="*" to="BOOT-INF/lib/*"/>
</mappedresources>
<zipfileset src="${lib.dir}/loader/spring-boot-loader-jar-${ant-spring-boot.version}.jar" />
<zipfileset src="${lib.dir}/loader/spring-boot-loader-classic-jar-${ant-spring-boot.version}.jar" />
<manifest>
<attribute name="Main-Class" value="org.springframework.boot.loader.launch.JarLauncher" />
<attribute name="Start-Class" value="${start-class}" />

View File

@@ -7,6 +7,6 @@
</configurations>
<dependencies>
<dependency org="org.springframework.boot" name="spring-boot-starter" rev="${ant-spring-boot.version}" conf="compile" />
<dependency org="org.springframework.boot" name="spring-boot-loader" rev="${ant-spring-boot.version}" conf="loader->default" />
<dependency org="org.springframework.boot" name="spring-boot-loader-classic" rev="${ant-spring-boot.version}" conf="loader->default" />
</dependencies>
</ivy-module>