Skip to content

Commit add7d84

Browse files
committed
Merge pull request #46604 from nosan
* pr/46604: Update checkstyle configuration to use a checkstyle-header.txt file Closes gh-46604
2 parents 3de3629 + 6df1b88 commit add7d84

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

src/checkstyle/checkstyle-header.txt

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
^\Q/*\E$
2-
^\Q * Copyright \E2012-present\Q the original author or authors.\E$
3-
^\Q *\E$
4-
^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
5-
^\Q * you may not use this file except in compliance with the License.\E$
6-
^\Q * You may obtain a copy of the License at\E$
7-
^\Q *\E$
8-
^\Q * https://www.apache.org/licenses/LICENSE-2.0\E$
9-
^\Q *\E$
10-
^\Q * Unless required by applicable law or agreed to in writing, software\E$
11-
^\Q * distributed under the License is distributed on an "AS IS" BASIS,\E$
12-
^\Q * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\E$
13-
^\Q * See the License for the specific language governing permissions and\E$
14-
^\Q * limitations under the License.\E$
15-
^\Q */\E$
16-
^$
17-
^.*$
1+
/*
2+
* Copyright 2012-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/

src/checkstyle/checkstyle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</module>
99
<module name="io.spring.javaformat.checkstyle.SpringChecks" />
1010
<module name="io.spring.javaformat.checkstyle.check.SpringHeaderCheck">
11-
<property name="headerCopyrightPattern" value="2012-present" />
11+
<property name="headerFile" value="${config_loc}/checkstyle-header.txt"/>
1212
</module>
1313
<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
1414
<module name="io.spring.javaformat.checkstyle.check.SpringDeprecatedCheck" />

0 commit comments

Comments
 (0)