Browse Source

Merge branch '3.2.x'

Closes gh-39074
pull/39087/head
Moritz Halbritter 2 years ago
parent
commit
eda2261665
  1. 2
      buildSrc/src/main/resources/NOTICE.txt
  2. 2
      eclipse/eclipse.properties
  3. 2
      spring-boot-project/spring-boot-docs/src/docs/asciidoc/index-docinfo.xml
  4. 2
      spring-boot-project/spring-boot-docs/src/docs/asciidoc/legal.adoc

2
buildSrc/src/main/resources/NOTICE.txt

@ -1,5 +1,5 @@
Spring Boot ${version} Spring Boot ${version}
Copyright (c) 2012-2023 VMware, Inc. Copyright (c) 2012-2024 VMware, Inc.
This product is licensed to you under the Apache License, Version 2.0 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 (the "License"). You may not use this product except in compliance with

2
eclipse/eclipse.properties

@ -1 +1 @@
copyright-year=2012-2023 copyright-year=2012-2024

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/index-docinfo.xml

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

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/legal.adoc

@ -1,7 +1,7 @@
[[legal]] [[legal]]
= Legal = Legal
Copyright &#169; 2012-2023 Copyright &#169; 2012-2024
Copies of this document may be made for your own use and for distribution to 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 others, provided that you do not charge any fee for such copies and further

Loading…
Cancel
Save