SpringCloud/spring-cloud-build
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed copyright pattern; fixes gh-62

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-11-16 13:04:03 +01:00
parent 807a327c8c
commit b61fcecfb4
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -325,8 +325,8 @@ limitations under the License.
<phase>validate</phase>
<inherited>true</inherited>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<headerLocation>LICENSE.txt</headerLocation>
<headerLocation>spring-cloud-build-tools/src/main/resources/checkstyle-header.txt</headerLocation>
<propertyExpansion>checkstyle.build.directory=${project.build.directory}</propertyExpansion>
<consoleOutput>true</consoleOutput>
<!-- TODO: Start fixing the errors -->
<includeTestSourceDirectory>false</includeTestSourceDirectory>

17
spring-cloud-build-tools/src/main/resources/checkstyle-header.txt Normal file
View File

@@ -0,0 +1,17 @@
^\Q/*\E$
^\Q * Copyright \E20\d\d\-20\d\d\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$
^\Q * You may obtain a copy of the License at\E$
^\Q *\E$
^\Q * http://www.apache.org/licenses/LICENSE-2.0\E$
^\Q *\E$
^\Q * Unless required by applicable law or agreed to in writing, software\E$
^\Q * distributed under the License is distributed on an "AS IS" BASIS,\E$
^\Q * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\E$
^\Q * See the License for the specific language governing permissions and\E$
^\Q * limitations under the License.\E$
^\Q */\E$
^$
^.*$

9
spring-cloud-build-tools/src/main/resources/checkstyle.xml
View File

@@ -6,11 +6,10 @@
<!-- TAKEN FROM SPRING BOOT -->
<!-- Root Checks -->
<!--<module name="io.spring.javaformat.checkstyle.check.SpringHeaderCheck">
<property name="fileExtensions" value="java" />
<property name="headerType" value="${headerType}"/>
<property name="headerCopyrightPattern" value="${headerCopyrightPattern}"/>
</module>-->
<module name="com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck">
<property name="headerFile" value="${checkstyle.header.file}" />
<property name="fileExtensions" value="java,groovy" />
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
<property name="lineSeparator" value="lf"/>
</module>