Merge branch '3.4.x' into 3.5.x

Closes gh-46066
This commit is contained in:
Phillip Webb
2025-06-20 17:23:52 -07:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
copyright-year=2012-2025
copyright-year=2012-present
+1 -1
View File
@@ -1,5 +1,5 @@
^\Q/*\E$
^\Q * Copyright \E2012-20\d\d\Q the original author or authors.\E$
^\Q * Copyright \E2012-present\Q the original author or authors.\E$
^\Q *\E$
^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
^\Q * you may not use this file except in compliance with the License.\E$