Merge branch '2.5.x' into 2.6.x

Closes gh-29198
This commit is contained in:
Stephane Nicoll 2022-01-02 11:25:46 +01:00
commit f54ea67ed6
4 changed files with 4 additions and 4 deletions

View File

@ -1,5 +1,5 @@
Spring Boot ${version}
Copyright (c) 2012-2021 Pivotal, Inc.
Copyright (c) 2012-2022 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

View File

@ -1 +1 @@
copyright-year=2012-2021
copyright-year=2012-2022

View File

@ -1,7 +1,7 @@
<productname>Spring Boot</productname>
<releaseinfo>{spring-boot-version}</releaseinfo>
<copyright>
<year>2012-2021</year>
<year>2012-2022</year>
</copyright>
<legalnotice>
<para>

View File

@ -1,7 +1,7 @@
[[legal]]
= Legal
Copyright &#169; 2012-2021
Copyright &#169; 2012-2022
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