[java-idp-integration-tests] branch master updated: JPAR-148 - Checkstyle 8.24+ compatibility

[Tom Zeller]

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

tzeller pushed a commit to branch master
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=9456809354445d1f053f0cc560d46d59a12cc084

The following commit(s) were added to refs/heads/master by this push:
       new  9456809   JPAR-148 - Checkstyle 8.24+ compatibility
9456809 is described below

commit 9456809354445d1f053f0cc560d46d59a12cc084
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Fri Nov 15 12:53:50 2019 -0600

    JPAR-148 - Checkstyle 8.24+ compatibility
    
    https://issues.shibboleth.net/jira/browse/JPAR-148
---
 checkstyle.xml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index 386c29a..4433ced 100644
--- a/checkstyle.xml
+++ b/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"/>
@@ -37,9 +36,6 @@
     <module name="IllegalImport"/>
     <module name="RedundantImport"/>
     <module name="UnusedImports"/>
-    <module name="LineLength">
-      <property name="max" value="120"/>
-    </module>
     <module name="MethodLength">
       <property name="max" value="70"/>
     </module>
@@ -100,18 +96,21 @@
       <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">
     <property name="max" value="1000"/>
   </module>
   <module name="Header">
-    <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 [...]
+    <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 name="LineLength">
+    <property name="max" value="120"/>
+  </module>
+</module>

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