[java-idp-plugin-oidc-rp] branch main updated: Adjust checkstyle files.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-idp-plugin-oidc-rp.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-rp.git;a=commit;h=6e3ea83a4ae5a921ca449d5fe1d2f26658efee6b

The following commit(s) were added to refs/heads/main by this push:
     new 6e3ea83  Adjust checkstyle files.
6e3ea83 is described below

commit 6e3ea83a4ae5a921ca449d5fe1d2f26658efee6b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 1 13:22:00 2023 -0400

    Adjust checkstyle files.
---
 idp-oidc-rp-api/.checkstyle                           | 15 +++++++++++++++
 idp-oidc-rp-impl/.checkstyle                          | 16 ++++++++++++----
 checkstyle.xml => resources/checkstyle/checkstyle.xml |  7 ++++++-
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/idp-oidc-rp-api/.checkstyle b/idp-oidc-rp-api/.checkstyle
new file mode 100644
index 0000000..097b128
--- /dev/null
+++ b/idp-oidc-rp-api/.checkstyle
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+
+    <local-check-config name="Shibboleth Checkstyle" location="/java-idp-plugin-oidc-rp/resources/checkstyle/checkstyle.xml" type="project" description="">
+        <additional-data name="cache-file" value="true"/>
+        <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+        <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+    </local-check-config>
+  
+    <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+        <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+    </fileset>
+  
+</fileset-config>
diff --git a/idp-oidc-rp-impl/.checkstyle b/idp-oidc-rp-impl/.checkstyle
index 162e469..097b128 100644
--- a/idp-oidc-rp-impl/.checkstyle
+++ b/idp-oidc-rp-impl/.checkstyle
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <fileset name="all" enabled="true" check-config-name="shibboleth" local="false">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+
+    <local-check-config name="Shibboleth Checkstyle" location="/java-idp-plugin-oidc-rp/resources/checkstyle/checkstyle.xml" type="project" description="">
+        <additional-data name="cache-file" value="true"/>
+        <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+        <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+    </local-check-config>
+  
+    <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+        <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+    </fileset>
+  
 </fileset-config>
diff --git a/checkstyle.xml b/resources/checkstyle/checkstyle.xml
similarity index 82%
rename from checkstyle.xml
rename to resources/checkstyle/checkstyle.xml
index f3f13f6..f456c13 100644
--- a/checkstyle.xml
+++ b/resources/checkstyle/checkstyle.xml
@@ -10,6 +10,11 @@
 -->
 <module name="Checker">
   <property name="severity" value="warning"/>
+  <module name="SuppressWithPlainTextCommentFilter">
+    <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 name="TreeWalker">
     <property name="tabWidth" value="4"/>
     <module name="JavadocMethod"/>
@@ -108,7 +113,7 @@
     <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 cop [...]
+    <property name="header" value="/*\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *    http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, eit [...]
   </module>
   <module name="JavadocPackage"/>
   <module name="LineLength">

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