root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix name for Implementation-Title in Spring Boot Gradle plugin 

See gh-34177
This commit is contained in:
Johnny Lim 2023-02-14 13:17:22 +09:00 committed by Andy Wilkinson
parent e7a5e71577
commit d368115128
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ class BootArchiveSupport {
} }
void configureManifest(Manifest manifest, String mainClass, String classes, String lib, String classPathIndex, void configureManifest(Manifest manifest, String mainClass, String classes, String lib, String classPathIndex,
String layersIndex, String jdkVersion, String implementationName, Object implementationVersion) { String layersIndex, String jdkVersion, String implementationTitle, Object implementationVersion) {
Attributes attributes = manifest.getAttributes(); Attributes attributes = manifest.getAttributes();
attributes.putIfAbsent("Main-Class", this.loaderMainClass); attributes.putIfAbsent("Main-Class", this.loaderMainClass);
attributes.putIfAbsent("Start-Class", mainClass); attributes.putIfAbsent("Start-Class", mainClass);
@ -101,7 +101,7 @@ class BootArchiveSupport {
attributes.putIfAbsent("Spring-Boot-Layers-Index", layersIndex); attributes.putIfAbsent("Spring-Boot-Layers-Index", layersIndex);
} }
attributes.putIfAbsent("Build-Jdk-Spec", jdkVersion); attributes.putIfAbsent("Build-Jdk-Spec", jdkVersion);
attributes.putIfAbsent("Implementation-Name", implementationName); attributes.putIfAbsent("Implementation-Title", implementationTitle);
if (implementationVersion != null) { if (implementationVersion != null) {
String versionString = implementationVersion.toString(); String versionString = implementationVersion.toString();
if (!UNSPECIFIED_VERSION.equals(versionString)) { if (!UNSPECIFIED_VERSION.equals(versionString)) {

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

@ -132,7 +132,7 @@ abstract class AbstractBootArchiveTests<T extends Jar & BootArchive> {
.isEqualTo(this.classesPath); .isEqualTo(this.classesPath);
assertThat(jarFile.getManifest().getMainAttributes().getValue("Spring-Boot-Lib")).isEqualTo(this.libPath); assertThat(jarFile.getManifest().getMainAttributes().getValue("Spring-Boot-Lib")).isEqualTo(this.libPath);
assertThat(jarFile.getManifest().getMainAttributes().getValue("Spring-Boot-Version")).isNotNull(); assertThat(jarFile.getManifest().getMainAttributes().getValue("Spring-Boot-Version")).isNotNull();
assertThat(jarFile.getManifest().getMainAttributes().getValue("Implementation-Name")) assertThat(jarFile.getManifest().getMainAttributes().getValue("Implementation-Title"))
.isEqualTo(this.project.getName()); .isEqualTo(this.project.getName());
assertThat(jarFile.getManifest().getMainAttributes().getValue("Implementation-Version")).isNull(); assertThat(jarFile.getManifest().getMainAttributes().getValue("Implementation-Version")).isNull();
} }
@ -141,10 +141,10 @@ abstract class AbstractBootArchiveTests<T extends Jar & BootArchive> {
@Test @Test
void whenImplementationNameIsCustomizedItShouldAppearInArchiveManifest() throws IOException { void whenImplementationNameIsCustomizedItShouldAppearInArchiveManifest() throws IOException {
this.task.getMainClass().set("com.example.Main"); this.task.getMainClass().set("com.example.Main");
this.task.getManifest().getAttributes().put("Implementation-Name", "Customized"); this.task.getManifest().getAttributes().put("Implementation-Title", "Customized");
executeTask(); executeTask();
try (JarFile jarFile = new JarFile(this.task.getArchiveFile().get().getAsFile())) { try (JarFile jarFile = new JarFile(this.task.getArchiveFile().get().getAsFile())) {
assertThat(jarFile.getManifest().getMainAttributes().getValue("Implementation-Name")) assertThat(jarFile.getManifest().getMainAttributes().getValue("Implementation-Title"))
.isEqualTo("Customized"); .isEqualTo("Customized");
} }
} }