Merge branch '2.0.x' into 2.1.x

wilkinsona · wilkinsona · commit db4623c51940 · 2019-04-02T10:27:34.000+01:00
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java
@@ -79,10 +79,20 @@ class BootArchiveSupport {
 		configureExclusions();
 	}
 
-	void configureManifest(Jar jar, String mainClassName) {
+	void configureManifest(Jar jar, String mainClassName, String springBootClasses,
+			String springBootLib) {
 		Attributes attributes = jar.getManifest().getAttributes();
 		attributes.putIfAbsent("Main-Class", this.loaderMainClass);
 		attributes.putIfAbsent("Start-Class", mainClassName);
+		attributes.computeIfAbsent("Spring-Boot-Version",
+				(key) -> determineSpringBootVersion());
+		attributes.putIfAbsent("Spring-Boot-Classes", springBootClasses);
+		attributes.putIfAbsent("Spring-Boot-Lib", springBootLib);
+	}
+
+	private String determineSpringBootVersion() {
+		String implementationVersion = getClass().getPackage().getImplementationVersion();
+		return (implementationVersion != null) ? implementationVersion : "unknown";
 	}
 
 	CopyAction createCopyAction(Jar jar) {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
@@ -74,7 +74,8 @@ private Action<CopySpec> classpathFiles(Spec<File> filter) {
 
 	@Override
 	public void copy() {
-		this.support.configureManifest(this, getMainClassName());
+		this.support.configureManifest(this, getMainClassName(), "BOOT-INF/classes/",
+				"BOOT-INF/lib/");
 		super.copy();
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java
@@ -68,7 +68,8 @@ public BootWar() {
 
 	@Override
 	public void copy() {
-		this.support.configureManifest(this, getMainClassName());
+		this.support.configureManifest(this, getMainClassName(), "WEB-INF/classes/",
+				"WEB-INF/lib/");
 		super.copy();
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java
@@ -106,6 +106,13 @@ public void basicArchiveCreation() throws IOException {
 					.isEqualTo(this.launcherClass);
 			assertThat(jarFile.getManifest().getMainAttributes().getValue("Start-Class"))
 					.isEqualTo("com.example.Main");
+			assertThat(jarFile.getManifest().getMainAttributes()
+					.getValue("Spring-Boot-Classes")).isEqualTo(this.classesPath);
+			assertThat(
+					jarFile.getManifest().getMainAttributes().getValue("Spring-Boot-Lib"))
+							.isEqualTo(this.libPath);
+			assertThat(jarFile.getManifest().getMainAttributes()
+					.getValue("Spring-Boot-Version")).isNotNull();
 		}
 	}
 
@@ -115,8 +122,8 @@ public void classpathJarsArePackagedBeneathLibPath() throws IOException {
 		this.task.classpath(jarFile("one.jar"), jarFile("two.jar"));
 		this.task.execute();
 		try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {
-			assertThat(jarFile.getEntry(this.libPath + "/one.jar")).isNotNull();
-			assertThat(jarFile.getEntry(this.libPath + "/two.jar")).isNotNull();
+			assertThat(jarFile.getEntry(this.libPath + "one.jar")).isNotNull();
+			assertThat(jarFile.getEntry(this.libPath + "two.jar")).isNotNull();
 		}
 	}
 
@@ -132,7 +139,7 @@ public void classpathFoldersArePackagedBeneathClassesPath() throws IOException {
 		this.task.execute();
 		try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {
 			assertThat(
-					jarFile.getEntry(this.classesPath + "/com/example/Application.class"))
+					jarFile.getEntry(this.classesPath + "com/example/Application.class"))
 							.isNotNull();
 		}
 	}
@@ -168,8 +175,8 @@ public void classpathCanBeSetUsingAFileCollection() throws IOException {
 		this.task.setClasspath(this.task.getProject().files(jarFile("two.jar")));
 		this.task.execute();
 		try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {
-			assertThat(jarFile.getEntry(this.libPath + "/one.jar")).isNull();
-			assertThat(jarFile.getEntry(this.libPath + "/two.jar")).isNotNull();
+			assertThat(jarFile.getEntry(this.libPath + "one.jar")).isNull();
+			assertThat(jarFile.getEntry(this.libPath + "two.jar")).isNotNull();
 		}
 	}
 
@@ -180,8 +187,8 @@ public void classpathCanBeSetUsingAnObject() throws IOException {
 		this.task.setClasspath(jarFile("two.jar"));
 		this.task.execute();
 		try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {
-			assertThat(jarFile.getEntry(this.libPath + "/one.jar")).isNull();
-			assertThat(jarFile.getEntry(this.libPath + "/two.jar")).isNotNull();
+			assertThat(jarFile.getEntry(this.libPath + "one.jar")).isNull();
+			assertThat(jarFile.getEntry(this.libPath + "two.jar")).isNotNull();
 		}
 	}
 
@@ -229,9 +236,9 @@ public void unpackCommentIsAddedToEntryIdentifiedByAPattern() throws IOException
 		this.task.requiresUnpack("**/one.jar");
 		this.task.execute();
 		try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {
-			assertThat(jarFile.getEntry(this.libPath + "/one.jar").getComment())
+			assertThat(jarFile.getEntry(this.libPath + "one.jar").getComment())
 					.startsWith("UNPACK:");
-			assertThat(jarFile.getEntry(this.libPath + "/two.jar").getComment()).isNull();
+			assertThat(jarFile.getEntry(this.libPath + "two.jar").getComment()).isNull();
 		}
 	}
 
@@ -242,9 +249,9 @@ public void unpackCommentIsAddedToEntryIdentifiedByASpec() throws IOException {
 		this.task.requiresUnpack((element) -> element.getName().endsWith("two.jar"));
 		this.task.execute();
 		try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {
-			assertThat(jarFile.getEntry(this.libPath + "/two.jar").getComment())
+			assertThat(jarFile.getEntry(this.libPath + "two.jar").getComment())
 					.startsWith("UNPACK:");
-			assertThat(jarFile.getEntry(this.libPath + "/one.jar").getComment()).isNull();
+			assertThat(jarFile.getEntry(this.libPath + "one.jar").getComment()).isNull();
 		}
 	}
 
@@ -375,7 +382,7 @@ public void devtoolsJarIsExcludedByDefault() throws IOException {
 		this.task.execute();
 		assertThat(this.task.getArchivePath()).exists();
 		try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {
-			assertThat(jarFile.getEntry(this.libPath + "/spring-boot-devtools-0.1.2.jar"))
+			assertThat(jarFile.getEntry(this.libPath + "spring-boot-devtools-0.1.2.jar"))
 					.isNull();
 		}
 	}
@@ -388,7 +395,7 @@ public void devtoolsJarCanBeIncluded() throws IOException {
 		this.task.execute();
 		assertThat(this.task.getArchivePath()).exists();
 		try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {
-			assertThat(jarFile.getEntry(this.libPath + "/spring-boot-devtools-0.1.2.jar"))
+			assertThat(jarFile.getEntry(this.libPath + "spring-boot-devtools-0.1.2.jar"))
 					.isNotNull();
 		}
 	}
@@ -429,9 +436,9 @@ public void loaderIsWrittenFirstThenApplicationClassesThenLibraries()
 		this.task.execute();
 		assertThat(getEntryNames(this.task.getArchivePath())).containsSubsequence(
 				"org/springframework/boot/loader/",
-				this.classesPath + "/com/example/Application.class",
-				this.libPath + "/first-library.jar", this.libPath + "/second-library.jar",
-				this.libPath + "/third-library.jar");
+				this.classesPath + "com/example/Application.class",
+				this.libPath + "first-library.jar", this.libPath + "second-library.jar",
+				this.libPath + "third-library.jar");
 	}
 
 	protected File jarFile(String name) throws IOException {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ public class BootJarTests extends AbstractBootArchiveTests<BootJar> {
 
 	public BootJarTests() {
 		super(BootJar.class, "org.springframework.boot.loader.JarLauncher",
-				"BOOT-INF/lib", "BOOT-INF/classes");
+				"BOOT-INF/lib/", "BOOT-INF/classes/");
 	}
 
 	@Test
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootWarTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootWarTests.java
@@ -32,8 +32,8 @@
 public class BootWarTests extends AbstractBootArchiveTests<BootWar> {
 
 	public BootWarTests() {
-		super(BootWar.class, "org.springframework.boot.loader.WarLauncher", "WEB-INF/lib",
-				"WEB-INF/classes");
+		super(BootWar.class, "org.springframework.boot.loader.WarLauncher",
+				"WEB-INF/lib/", "WEB-INF/classes/");
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,8 @@ private Action<CopySpec> classpathFiles(Spec<File> filter) {`
`74`	`74`
`75`	`75`	`@Override`
`76`	`76`	`public void copy() {`
`77`		`- this.support.configureManifest(this, getMainClassName());`
	`77`	`+ this.support.configureManifest(this, getMainClassName(), "BOOT-INF/classes/",`
	`78`	`+ "BOOT-INF/lib/");`
`78`	`79`	`super.copy();`
`79`	`80`	`}`
`80`	`81`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ public BootWar() {`
`68`	`68`
`69`	`69`	`@Override`
`70`	`70`	`public void copy() {`
`71`		`- this.support.configureManifest(this, getMainClassName());`
	`71`	`+ this.support.configureManifest(this, getMainClassName(), "WEB-INF/classes/",`
	`72`	`+ "WEB-INF/lib/");`
`72`	`73`	`super.copy();`
`73`	`74`	`}`
`74`	`75`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,13 @@ public void basicArchiveCreation() throws IOException {`
`106`	`106`	`.isEqualTo(this.launcherClass);`
`107`	`107`	`assertThat(jarFile.getManifest().getMainAttributes().getValue("Start-Class"))`
`108`	`108`	`.isEqualTo("com.example.Main");`
	`109`	`+ assertThat(jarFile.getManifest().getMainAttributes()`
	`110`	`+ .getValue("Spring-Boot-Classes")).isEqualTo(this.classesPath);`
	`111`	`+ assertThat(`
	`112`	`+ jarFile.getManifest().getMainAttributes().getValue("Spring-Boot-Lib"))`
	`113`	`+ .isEqualTo(this.libPath);`
	`114`	`+ assertThat(jarFile.getManifest().getMainAttributes()`
	`115`	`+ .getValue("Spring-Boot-Version")).isNotNull();`
`109`	`116`	`}`
`110`	`117`	`}`
`111`	`118`
`@@ -115,8 +122,8 @@ public void classpathJarsArePackagedBeneathLibPath() throws IOException {`
`115`	`122`	`this.task.classpath(jarFile("one.jar"), jarFile("two.jar"));`
`116`	`123`	`this.task.execute();`
`117`	`124`	`try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {`
`118`		`- assertThat(jarFile.getEntry(this.libPath + "/one.jar")).isNotNull();`
`119`		`- assertThat(jarFile.getEntry(this.libPath + "/two.jar")).isNotNull();`
	`125`	`+ assertThat(jarFile.getEntry(this.libPath + "one.jar")).isNotNull();`
	`126`	`+ assertThat(jarFile.getEntry(this.libPath + "two.jar")).isNotNull();`
`120`	`127`	`}`
`121`	`128`	`}`
`122`	`129`
`@@ -132,7 +139,7 @@ public void classpathFoldersArePackagedBeneathClassesPath() throws IOException {`
`132`	`139`	`this.task.execute();`
`133`	`140`	`try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {`
`134`	`141`	`assertThat(`
`135`		`- jarFile.getEntry(this.classesPath + "/com/example/Application.class"))`
	`142`	`+ jarFile.getEntry(this.classesPath + "com/example/Application.class"))`
`136`	`143`	`.isNotNull();`
`137`	`144`	`}`
`138`	`145`	`}`
`@@ -168,8 +175,8 @@ public void classpathCanBeSetUsingAFileCollection() throws IOException {`
`168`	`175`	`this.task.setClasspath(this.task.getProject().files(jarFile("two.jar")));`
`169`	`176`	`this.task.execute();`
`170`	`177`	`try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {`
`171`		`- assertThat(jarFile.getEntry(this.libPath + "/one.jar")).isNull();`
`172`		`- assertThat(jarFile.getEntry(this.libPath + "/two.jar")).isNotNull();`
	`178`	`+ assertThat(jarFile.getEntry(this.libPath + "one.jar")).isNull();`
	`179`	`+ assertThat(jarFile.getEntry(this.libPath + "two.jar")).isNotNull();`
`173`	`180`	`}`
`174`	`181`	`}`
`175`	`182`
`@@ -180,8 +187,8 @@ public void classpathCanBeSetUsingAnObject() throws IOException {`
`180`	`187`	`this.task.setClasspath(jarFile("two.jar"));`
`181`	`188`	`this.task.execute();`
`182`	`189`	`try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {`
`183`		`- assertThat(jarFile.getEntry(this.libPath + "/one.jar")).isNull();`
`184`		`- assertThat(jarFile.getEntry(this.libPath + "/two.jar")).isNotNull();`
	`190`	`+ assertThat(jarFile.getEntry(this.libPath + "one.jar")).isNull();`
	`191`	`+ assertThat(jarFile.getEntry(this.libPath + "two.jar")).isNotNull();`
`185`	`192`	`}`
`186`	`193`	`}`
`187`	`194`
`@@ -229,9 +236,9 @@ public void unpackCommentIsAddedToEntryIdentifiedByAPattern() throws IOException`
`229`	`236`	`this.task.requiresUnpack("**/one.jar");`
`230`	`237`	`this.task.execute();`
`231`	`238`	`try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {`
`232`		`- assertThat(jarFile.getEntry(this.libPath + "/one.jar").getComment())`
	`239`	`+ assertThat(jarFile.getEntry(this.libPath + "one.jar").getComment())`
`233`	`240`	`.startsWith("UNPACK:");`
`234`		`- assertThat(jarFile.getEntry(this.libPath + "/two.jar").getComment()).isNull();`
	`241`	`+ assertThat(jarFile.getEntry(this.libPath + "two.jar").getComment()).isNull();`
`235`	`242`	`}`
`236`	`243`	`}`
`237`	`244`
`@@ -242,9 +249,9 @@ public void unpackCommentIsAddedToEntryIdentifiedByASpec() throws IOException {`
`242`	`249`	`this.task.requiresUnpack((element) -> element.getName().endsWith("two.jar"));`
`243`	`250`	`this.task.execute();`
`244`	`251`	`try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {`
`245`		`- assertThat(jarFile.getEntry(this.libPath + "/two.jar").getComment())`
	`252`	`+ assertThat(jarFile.getEntry(this.libPath + "two.jar").getComment())`
`246`	`253`	`.startsWith("UNPACK:");`
`247`		`- assertThat(jarFile.getEntry(this.libPath + "/one.jar").getComment()).isNull();`
	`254`	`+ assertThat(jarFile.getEntry(this.libPath + "one.jar").getComment()).isNull();`
`248`	`255`	`}`
`249`	`256`	`}`
`250`	`257`
`@@ -375,7 +382,7 @@ public void devtoolsJarIsExcludedByDefault() throws IOException {`
`375`	`382`	`this.task.execute();`
`376`	`383`	`assertThat(this.task.getArchivePath()).exists();`
`377`	`384`	`try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {`
`378`		`- assertThat(jarFile.getEntry(this.libPath + "/spring-boot-devtools-0.1.2.jar"))`
	`385`	`+ assertThat(jarFile.getEntry(this.libPath + "spring-boot-devtools-0.1.2.jar"))`
`379`	`386`	`.isNull();`
`380`	`387`	`}`
`381`	`388`	`}`
`@@ -388,7 +395,7 @@ public void devtoolsJarCanBeIncluded() throws IOException {`
`388`	`395`	`this.task.execute();`
`389`	`396`	`assertThat(this.task.getArchivePath()).exists();`
`390`	`397`	`try (JarFile jarFile = new JarFile(this.task.getArchivePath())) {`
`391`		`- assertThat(jarFile.getEntry(this.libPath + "/spring-boot-devtools-0.1.2.jar"))`
	`398`	`+ assertThat(jarFile.getEntry(this.libPath + "spring-boot-devtools-0.1.2.jar"))`
`392`	`399`	`.isNotNull();`
`393`	`400`	`}`
`394`	`401`	`}`
`@@ -429,9 +436,9 @@ public void loaderIsWrittenFirstThenApplicationClassesThenLibraries()`
`429`	`436`	`this.task.execute();`
`430`	`437`	`assertThat(getEntryNames(this.task.getArchivePath())).containsSubsequence(`
`431`	`438`	`"org/springframework/boot/loader/",`
`432`		`- this.classesPath + "/com/example/Application.class",`
`433`		`- this.libPath + "/first-library.jar", this.libPath + "/second-library.jar",`
`434`		`- this.libPath + "/third-library.jar");`
	`439`	`+ this.classesPath + "com/example/Application.class",`
	`440`	`+ this.libPath + "first-library.jar", this.libPath + "second-library.jar",`
	`441`	`+ this.libPath + "third-library.jar");`
`435`	`442`	`}`
`436`	`443`
`437`	`444`	`protected File jarFile(String name) throws IOException {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2018 the original author or authors.`
	`2`	`+ * Copyright 2012-2019 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -33,7 +33,7 @@ public class BootJarTests extends AbstractBootArchiveTests<BootJar> {`
`33`	`33`
`34`	`34`	`public BootJarTests() {`
`35`	`35`	`super(BootJar.class, "org.springframework.boot.loader.JarLauncher",`
`36`		`- "BOOT-INF/lib", "BOOT-INF/classes");`
	`36`	`+ "BOOT-INF/lib/", "BOOT-INF/classes/");`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@`
`32`	`32`	`public class BootWarTests extends AbstractBootArchiveTests<BootWar> {`
`33`	`33`
`34`	`34`	`public BootWarTests() {`
`35`		`- super(BootWar.class, "org.springframework.boot.loader.WarLauncher", "WEB-INF/lib",`
`36`		`- "WEB-INF/classes");`
	`35`	`+ super(BootWar.class, "org.springframework.boot.loader.WarLauncher",`
	`36`	`+ "WEB-INF/lib/", "WEB-INF/classes/");`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Test`