Skip to content

Commit b5f58be

Browse files
authored
Merge pull request #1125 from oracle/derek-checkstyle-copyright
Checkstyle Copyright Headers
2 parents 1f3ca45 + f34ac4a commit b5f58be

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/customized_google_checks.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<property name="eachLine" value="true"/>
2828
</module>
2929

30+
<module name="RegexpHeader">
31+
<property name="headerFile" value="build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/java.header"/>
32+
<property name="fileExtensions" value="java"/>
33+
</module>
34+
3035
<module name="TreeWalker">
3136
<module name="OuterTypeFilename"/>
3237
<module name="IllegalTokenText">
@@ -42,7 +47,7 @@
4247
<property name="allowNonPrintableEscapes" value="true"/>
4348
</module>
4449
<module name="LineLength">
45-
<property name="max" value="100"/>
50+
<property name="max" value="120"/>
4651
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
4752
</module>
4853
<module name="AvoidStarImport"/>
@@ -193,7 +198,7 @@
193198
<module name="CustomImportOrder">
194199
<property name="sortImportsInGroupAlphabetically" value="true"/>
195200
<property name="separateLineBetweenGroups" value="true"/>
196-
<property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
201+
<property name="customImportOrderRules" value="STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###STATIC"/>
197202
</module>
198203
<module name="MethodParamPad"/>
199204
<module name="NoWhitespaceBefore">
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
^// Copyright (\d\d\d\d, )+Oracle Corporation and\/or its affiliates\. All rights reserved\.$
2+
^// Licensed under the Universal Permissive License v 1\.0 as shown at$
3+
^// http://oss\.oracle\.com/licenses/upl\.$

0 commit comments

Comments
 (0)