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

Remove remaining use of loader classic

Browse Source 
Closes gh-42495
This commit is contained in:
Phillip Webb
2024-10-01 18:23:35 -07:00
parent 430753e4a8
commit 54dcd9894c
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle
View File

@@ -18,7 +18,7 @@ dependencies {
antUnit "org.apache.ant:ant-antunit:1.3"
antIvy "org.apache.ivy:ivy:2.5.0"
compileOnly(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-classic"))
compileOnly(project(":spring-boot-project:spring-boot-tools:spring-boot-loader"))
compileOnly("org.apache.ant:ant:${antVersion}")
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))

4
spring-boot-project/spring-boot-tools/spring-boot-antlib/src/main/resources/org/springframework/boot/ant/antlib.xml
View File

@@ -42,7 +42,7 @@
<echo>Extracting spring-boot-loader to ${destdir}/dependency</echo>
<copy todir="${destdir}/dependency">
<javaresource name="META-INF/loader/spring-boot-loader-classic.jar"
<javaresource name="META-INF/loader/spring-boot-loader.jar"
loaderref="spring.boot.antlib.loader" />
<flattenmapper />
</copy>
@@ -58,7 +58,7 @@
<lib />
<globmapper from="*" to="BOOT-INF/lib/*" />
</mappedresources>
<zipfileset src="${destdir}/dependency/spring-boot-loader-classic.jar" />
<zipfileset src="${destdir}/dependency/spring-boot-loader.jar" />
<manifest>
<attribute name="Main-Class"
value="org.springframework.boot.loader.launch.JarLauncher" />

2
spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle
View File

@@ -34,7 +34,7 @@ dependencies {
intTestImplementation("org.junit.jupiter:junit-jupiter")
intTestImplementation("org.springframework:spring-core")
loader(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-classic"))
loader(project(":spring-boot-project:spring-boot-tools:spring-boot-loader"))
testImplementation(project(":spring-boot-project:spring-boot"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))

2
spring-boot-project/spring-boot-tools/spring-boot-jarmode-tools/build.gradle
View File

@@ -6,7 +6,7 @@ plugins {
description = "Spring Boot Jarmode Tools"
dependencies {
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-classic"))
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader"))
implementation("org.springframework:spring-core")
testImplementation("org.assertj:assertj-core")

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle
View File

@@ -29,7 +29,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-classic", configuration: "mavenRepository"))
testRepository(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader", 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"))

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.xml
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-classic-jar-${ant-spring-boot.version}.jar" />
<zipfileset src="${lib.dir}/loader/spring-boot-loader-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}" />

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivy.xml
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-classic" rev="${ant-spring-boot.version}" conf="loader->default" />
<dependency org="org.springframework.boot" name="spring-boot-loader" rev="${ant-spring-boot.version}" conf="loader->default" />
</dependencies>
</ivy-module>