[java-parent-project] branch maint-7 updated: JPAR-101 - Eclipse and Checkstyle 8.1+ compatibility issues

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch maint-7
in repository java-parent-project.

View the commit online:
http://git.shibboleth.net/view/?p=java-parent-project.git;a=commit;h=8da694807517fe5f16fce3f9e3e3912fbebe1596

The following commit(s) were added to refs/heads/maint-7 by this push:
       new  8da6948   JPAR-101 - Eclipse and Checkstyle 8.1+ compatibility issues
8da6948 is described below

commit 8da694807517fe5f16fce3f9e3e3912fbebe1596
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Jan 25 16:53:43 2018 +0000

    JPAR-101 - Eclipse and Checkstyle 8.1+ compatibility issues
---
 pom.xml                             |  2 +-
 resources/checkstyle/checkstyle.xml | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4b27350..0737697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
         <spring-webflow.version>2.4.7.RELEASE</spring-webflow.version>
         <xmlsec.version>2.0.8</xmlsec.version>
 
-        <checkstyle.version>6.19</checkstyle.version>
+        <checkstyle.version>8.7</checkstyle.version>
         <checkstyle-plugin.version>2.17</checkstyle-plugin.version>
         <checkstyle.configLocation>checkstyle.xml</checkstyle.configLocation>
 
diff --git a/resources/checkstyle/checkstyle.xml b/resources/checkstyle/checkstyle.xml
index 5cab513..48ae807 100644
--- a/resources/checkstyle/checkstyle.xml
+++ b/resources/checkstyle/checkstyle.xml
@@ -11,7 +11,6 @@
 <module name="Checker">
   <property name="severity" value="warning"/>
   <module name="TreeWalker">
-    <module name="FileContentsHolder"/>
     <property name="tabWidth" value="4"/>
     <module name="JavadocMethod">
       <property name="allowThrowsTagsForSubclasses" value="true"/>
@@ -100,11 +99,11 @@
       <property name="tokens" value="PARAMETER_DEF,VARIABLE_DEF"/>
       <property name="validateEnhancedForLoopVariable" value="true"/>
     </module>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="\bCheck[Ss]tyle:\s*([\w|]+)\s+OFF\b"/>
-    <property name="onCommentFormat" value="\bCheck[Ss]tyle:\s*([\w|]+)\s+ON\b"/>
-    <property name="checkFormat" value="$1"/>
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="\bCheck[Ss]tyle:\s*([\w|]+)\s+OFF\b"/>
+      <property name="onCommentFormat" value="\bCheck[Ss]tyle:\s*([\w|]+)\s+ON\b"/>
+      <property name="checkFormat" value="$1"/>
+    </module>
   </module>
   <module name="FileTabCharacter"/>
   <module name="FileLength">
@@ -114,4 +113,4 @@
     <property name="header" value="/*\n * Licensed to the University Corporation for Advanced Internet Development,\n * Inc. (UCAID) under one or more contributor license agreements.  See the\n * NOTICE file distributed with this work for additional information regarding\n * copyright ownership. The UCAID licenses this file to You under the Apache\n * License, Version 2.0 (the "License"); you may not use this file except in\n * compliance with the License.  You may obtain a cop [...]
   </module>
   <module name="JavadocPackage"/>
-</module>
\ No newline at end of file
+</module>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.