Merge branch '3.4.x' into 3.5.x

philwebb · philwebb · commit d3c55740e1d4 · 2025-06-20T17:23:52.000-07:00
Closes gh-46066
diff --git a/eclipse/eclipse.properties b/eclipse/eclipse.properties
@@ -1 +1 @@
-copyright-year=2012-2025
+copyright-year=2012-present
diff --git a/src/checkstyle/checkstyle-header.txt b/src/checkstyle/checkstyle-header.txt
@@ -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$
