Merge branch '3.5.x'

Closes gh-46613

config/checkstyle/checkstyle-header.txt

@@ -1,17 +1,15 @@
-^\Q/*\E$
+/*
-^\Q * Copyright \E2012-present\Q the original author or authors.\E$
+ * Copyright 2012-present the original author or authors.
-^\Q *\E$
+ *
-^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
+ * Licensed under the Apache License, Version 2.0 (the "License");
-^\Q * you may not use this file except in compliance with the License.\E$
+ * you may not use this file except in compliance with the License.
-^\Q * You may obtain a copy of the License at\E$
+ * You may obtain a copy of the License at
-^\Q *\E$
+ *
-^\Q *      https://www.apache.org/licenses/LICENSE-2.0\E$
+ *      https://www.apache.org/licenses/LICENSE-2.0
-^\Q *\E$
+ *
-^\Q * Unless required by applicable law or agreed to in writing, software\E$
+ * Unless required by applicable law or agreed to in writing, software
-^\Q * distributed under the License is distributed on an "AS IS" BASIS,\E$
+ * distributed under the License is distributed on an "AS IS" BASIS,
-^\Q * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\E$
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-^\Q * See the License for the specific language governing permissions and\E$
+ * See the License for the specific language governing permissions and
-^\Q * limitations under the License.\E$
+ * limitations under the License.
-^\Q */\E$
+ */
-^$
-^.*$

config/checkstyle/checkstyle.xml

@@ -8,7 +8,7 @@
 	</module>
 	<module name="io.spring.javaformat.checkstyle.SpringChecks" />
 	<module name="io.spring.javaformat.checkstyle.check.SpringHeaderCheck">
-		<property name="headerCopyrightPattern" value="2012-present" />
+		<property name="headerFile" value="${config_loc}/checkstyle-header.txt"/>
 	</module>
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
 		<module name="io.spring.javaformat.checkstyle.check.SpringDeprecatedCheck" />