Author: michaelo
Date: Mon Sep 7 10:59:20 2015
New Revision: 1701605
URL: http://svn.apache.org/r1701605
Log:
[MCHECKSTYLE-307] Upgrade to Checkstyle 6.9
Intermediate upgrade to Checkstyle 6.3:
* Added a custom checkstyle.xml for IT MCHECKSTYLE-214-basedir-resource
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/checkstyle.xml
(with props)
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/pom.xml
Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1701605&r1=1701604&r2=1701605&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Mon Sep 7 10:59:20 2015
@@ -63,7 +63,7 @@ under the License.
<maven.compiler.source>1.${javaVersion}</maven.compiler.source>
<maven.compiler.target>1.${javaVersion}</maven.compiler.target>
<mavenVersion>2.2.1</mavenVersion>
- <checkstyleVersion>6.2</checkstyleVersion>
+ <checkstyleVersion>6.3</checkstyleVersion>
<doxiaVersion>1.4</doxiaVersion>
<sitePluginVersion>3.4</sitePluginVersion>
</properties>
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/checkstyle.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/checkstyle.xml?rev=1701605&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/checkstyle.xml
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/checkstyle.xml
Mon Sep 7 10:59:20 2015
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_3.dtd";>
+<module name="Checker">
+ <module name="NewlineAtEndOfFile"/>
+ <module name="Translation"/>
+ <module name="FileLength"/>
+ <module name="FileTabCharacter"/>
+ <module name="RegexpSingleline">
+ <property name="format" value="\s+$"/>
+ <property name="minimum" value="0"/>
+ <property name="maximum" value="0"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+</module>
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/checkstyle.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/pom.xml?rev=1701605&r1=1701604&r2=1701605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/pom.xml
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-214-basedir-resource/pom.xml
Mon Sep 7 10:59:20 2015
@@ -51,6 +51,7 @@
<version>@project.version@</version>
<configuration>
<resourceIncludes>**/*.txt</resourceIncludes>
+ <configLocation>checkstyle.xml</configLocation>
</configuration>
</plugin>
</plugins>
