Skip to content

Commit 54dcd98

Browse files
committed
Remove remaining use of loader classic
Closes spring-projectsgh-42495
1 parent 430753e commit 54dcd98

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
antUnit "org.apache.ant:ant-antunit:1.3"
1919
antIvy "org.apache.ivy:ivy:2.5.0"
2020

21-
compileOnly(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-classic"))
21+
compileOnly(project(":spring-boot-project:spring-boot-tools:spring-boot-loader"))
2222
compileOnly("org.apache.ant:ant:${antVersion}")
2323

2424
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
<echo>Extracting spring-boot-loader to ${destdir}/dependency</echo>
4444
<copy todir="${destdir}/dependency">
45-
<javaresource name="META-INF/loader/spring-boot-loader-classic.jar"
45+
<javaresource name="META-INF/loader/spring-boot-loader.jar"
4646
loaderref="spring.boot.antlib.loader" />
4747
<flattenmapper />
4848
</copy>
@@ -58,7 +58,7 @@
5858
<lib />
5959
<globmapper from="*" to="BOOT-INF/lib/*" />
6060
</mappedresources>
61-
<zipfileset src="${destdir}/dependency/spring-boot-loader-classic.jar" />
61+
<zipfileset src="${destdir}/dependency/spring-boot-loader.jar" />
6262
<manifest>
6363
<attribute name="Main-Class"
6464
value="org.springframework.boot.loader.launch.JarLauncher" />

spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies {
3434
intTestImplementation("org.junit.jupiter:junit-jupiter")
3535
intTestImplementation("org.springframework:spring-core")
3636

37-
loader(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-classic"))
37+
loader(project(":spring-boot-project:spring-boot-tools:spring-boot-loader"))
3838

3939
testImplementation(project(":spring-boot-project:spring-boot"))
4040
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))

spring-boot-project/spring-boot-tools/spring-boot-jarmode-tools/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
description = "Spring Boot Jarmode Tools"
77

88
dependencies {
9-
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-classic"))
9+
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader"))
1010
implementation("org.springframework:spring-core")
1111

1212
testImplementation("org.assertj:assertj-core")

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies {
2929
antDependencies "org.apache.ant:ant-launcher:1.10.7"
3030
antDependencies "org.apache.ant:ant:1.10.7"
3131

32-
testRepository(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-classic", configuration: "mavenRepository"))
32+
testRepository(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader", configuration: "mavenRepository"))
3333
testRepository(project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository"))
3434

3535
testImplementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<fileset dir="${lib.dir}/runtime" />
6666
<globmapper from="*" to="BOOT-INF/lib/*"/>
6767
</mappedresources>
68-
<zipfileset src="${lib.dir}/loader/spring-boot-loader-classic-jar-${ant-spring-boot.version}.jar" />
68+
<zipfileset src="${lib.dir}/loader/spring-boot-loader-jar-${ant-spring-boot.version}.jar" />
6969
<manifest>
7070
<attribute name="Main-Class" value="org.springframework.boot.loader.launch.JarLauncher" />
7171
<attribute name="Start-Class" value="${start-class}" />

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivy.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
</configurations>
88
<dependencies>
99
<dependency org="org.springframework.boot" name="spring-boot-starter" rev="${ant-spring-boot.version}" conf="compile" />
10-
<dependency org="org.springframework.boot" name="spring-boot-loader-classic" rev="${ant-spring-boot.version}" conf="loader->default" />
10+
<dependency org="org.springframework.boot" name="spring-boot-loader" rev="${ant-spring-boot.version}" conf="loader->default" />
1111
</dependencies>
1212
</ivy-module>

0 commit comments

Comments
 (0)