Skip to content

Commit 6e9d94e

Browse files
committed
Merge branch '3.0.x'
Closes gh-34183
2 parents 6bb7bef + cbf6e01 commit 6e9d94e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class BootArchiveSupport {
8787
}
8888

8989
void configureManifest(Manifest manifest, String mainClass, String classes, String lib, String classPathIndex,
90-
String layersIndex, String jdkVersion, String implementationName, Object implementationVersion) {
90+
String layersIndex, String jdkVersion, String implementationTitle, Object implementationVersion) {
9191
Attributes attributes = manifest.getAttributes();
9292
attributes.putIfAbsent("Main-Class", this.loaderMainClass);
9393
attributes.putIfAbsent("Start-Class", mainClass);
@@ -101,7 +101,7 @@ void configureManifest(Manifest manifest, String mainClass, String classes, Stri
101101
attributes.putIfAbsent("Spring-Boot-Layers-Index", layersIndex);
102102
}
103103
attributes.putIfAbsent("Build-Jdk-Spec", jdkVersion);
104-
attributes.putIfAbsent("Implementation-Name", implementationName);
104+
attributes.putIfAbsent("Implementation-Title", implementationTitle);
105105
if (implementationVersion != null) {
106106
String versionString = implementationVersion.toString();
107107
if (!UNSPECIFIED_VERSION.equals(versionString)) {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void basicArchiveCreation() throws IOException {
132132
.isEqualTo(this.classesPath);
133133
assertThat(jarFile.getManifest().getMainAttributes().getValue("Spring-Boot-Lib")).isEqualTo(this.libPath);
134134
assertThat(jarFile.getManifest().getMainAttributes().getValue("Spring-Boot-Version")).isNotNull();
135-
assertThat(jarFile.getManifest().getMainAttributes().getValue("Implementation-Name"))
135+
assertThat(jarFile.getManifest().getMainAttributes().getValue("Implementation-Title"))
136136
.isEqualTo(this.project.getName());
137137
assertThat(jarFile.getManifest().getMainAttributes().getValue("Implementation-Version")).isNull();
138138
}
@@ -141,10 +141,10 @@ void basicArchiveCreation() throws IOException {
141141
@Test
142142
void whenImplementationNameIsCustomizedItShouldAppearInArchiveManifest() throws IOException {
143143
this.task.getMainClass().set("com.example.Main");
144-
this.task.getManifest().getAttributes().put("Implementation-Name", "Customized");
144+
this.task.getManifest().getAttributes().put("Implementation-Title", "Customized");
145145
executeTask();
146146
try (JarFile jarFile = new JarFile(this.task.getArchiveFile().get().getAsFile())) {
147-
assertThat(jarFile.getManifest().getMainAttributes().getValue("Implementation-Name"))
147+
assertThat(jarFile.getManifest().getMainAttributes().getValue("Implementation-Title"))
148148
.isEqualTo("Customized");
149149
}
150150
}

0 commit comments

Comments
 (0)