From 8128f3090af9c3701bbdc7d99ff62bf9dd95d268 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 19 Feb 2020 10:11:02 +0000
Subject: [PATCH] Polish "Include LICENCE and NOTICE files in shipped jars"

See gh-20058
---
 .../org/springframework/boot/build/ConventionsPlugin.java | 8 ++++----
 buildSrc/src/main/resources/NOTICE.txt                    | 2 +-
 .../boot/build/ConventionsPluginTests.java                | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
index 52ca3edf20..b4d5231433 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
@@ -23,7 +23,6 @@ import java.io.InputStreamReader;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.time.Year;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -77,7 +76,8 @@ import org.springframework.util.FileCopyUtils;
  * <li>{@link JavaCompile}, {@link Javadoc}, and {@link FormatTask} tasks are configured
  * to use UTF-8 encoding
  * <li>{@link JavaCompile} tasks are configured to use {@code -parameters}
- * <li>{@link Jar} tasks are configured to have the following manifest entries:
+ * <li>{@link Jar} tasks are configured to produce jars with LICENSE.txt and NOTICE.txt
+ * files and the following manifest entries:
  * <ul>
  * <li>{@code Automatic-Module-Name}
  * <li>{@code Build-Jdk-Spec}
@@ -109,6 +109,7 @@ import org.springframework.util.FileCopyUtils;
  * {@link AsciidoctorConventions} are applied.
  *
  * @author Andy Wilkinson
+ * @author Christoph Dreis
  */
 public class ConventionsPlugin implements Plugin<Project> {
 
@@ -163,8 +164,7 @@ public class ConventionsPlugin implements Plugin<Project> {
 		try {
 			InputStream notice = getClass().getClassLoader().getResourceAsStream("NOTICE.txt");
 			String noticeContent = FileCopyUtils.copyToString(new InputStreamReader(notice, StandardCharsets.UTF_8))
-					.replace("${version}", project.getVersion().toString())
-					.replace("${currentYear}", Integer.toString(Year.now().getValue()));
+					.replace("${version}", project.getVersion().toString());
 			TextResourceFactory resourceFactory = project.getResources().getText();
 			File file = createLegalFile(resourceFactory.fromString(noticeContent).asFile(), "NOTICE.txt");
 			metaInf.from(file);
diff --git a/buildSrc/src/main/resources/NOTICE.txt b/buildSrc/src/main/resources/NOTICE.txt
index 2aa871e170..5c8b2f0f3e 100644
--- a/buildSrc/src/main/resources/NOTICE.txt
+++ b/buildSrc/src/main/resources/NOTICE.txt
@@ -1,5 +1,5 @@
 Spring Boot ${version}
-Copyright (c) 2012-${currentYear} Pivotal, Inc.
+Copyright (c) 2012-2020 Pivotal, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0
 (the "License"). You may not use this product except in compliance with
diff --git a/buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java b/buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java
index f9043c9570..1a3d2aab5d 100644
--- a/buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java
+++ b/buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java
@@ -44,8 +44,6 @@ class ConventionsPluginTests {
 
 	private File buildFile;
 
-	private File licenseFile;
-
 	@BeforeEach
 	void setup(@TempDir File projectDir) throws IOException {
 		this.projectDir = projectDir;