Merge branch '2.3.x' into 2.4.x

snicoll · snicoll · commit 052565ef2bb8 · 2021-01-01T09:18:13.000+01:00
Closes gh-24626
diff --git a/buildSrc/src/main/resources/NOTICE.txt b/buildSrc/src/main/resources/NOTICE.txt
@@ -1,5 +1,5 @@
 Spring Boot ${version}
-Copyright (c) 2012-2020 Pivotal, Inc.
+Copyright (c) 2012-2021 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/eclipse/eclipse.properties b/eclipse/eclipse.properties
@@ -1 +1 @@
-copyright-year=2012-2020
+copyright-year=2012-2021
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index-docinfo.xml b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/index-docinfo.xml
@@ -1,7 +1,7 @@
 <productname>Spring Boot</productname>
 <releaseinfo>{spring-boot-version}</releaseinfo>
 <copyright>
-	<year>2012-2020</year>
+	<year>2012-2021</year>
 </copyright>
 <legalnotice>
 	<para>
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/legal.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/legal.adoc
@@ -3,7 +3,7 @@
 
 {spring-boot-version}
 
-Copyright &#169; 2012-2020
+Copyright &#169; 2012-2021
 
 Copies of this document may be made for your own use and for distribution to
 others, provided that you do not charge any fee for such copies and further
