#135 Update to Checkstyle 8.18

checkstyle · Mar 23, 2019 · 266b85d · 266b85d
1 parent 7796f8f
commit 266b85d
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 12 deletions.
diff --git a/net.sf.eclipsecs.checkstyle/.classpath b/net.sf.eclipsecs.checkstyle/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="checkstyle-8.17-all.jar" sourcepath="checkstyle-checkstyle-8.17.zip"/>
+	<classpathentry exported="true" kind="lib" path="checkstyle-8.18-all.jar" sourcepath="checkstyle-checkstyle-8.18.zip"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

diff --git a/net.sf.eclipsecs.checkstyle/META-INF/MANIFEST.MF b/net.sf.eclipsecs.checkstyle/META-INF/MANIFEST.MF
@@ -46,5 +46,5 @@ Export-Package: .,
  com.puppycrawl.tools.checkstyle.utils,
  org.apache.commons.beanutils;version="8.17.0"
 Bundle-ClassPath: .,
- checkstyle-8.17-all.jar
+ checkstyle-8.18-all.jar
 Automatic-Module-Name: net.sf.eclipsecs.checkstyle
diff --git a/net.sf.eclipsecs.checkstyle/build.properties b/net.sf.eclipsecs.checkstyle/build.properties
@@ -1,6 +1,6 @@
 bin.includes = META-INF/,\
                .,\
                license/,\
-               checkstyle-8.17-all.jar
+               checkstyle-8.18-all.jar
 jars.compile.order = .
 source.. = metadata/
diff --git a/...ipsecs.checkstyle/checkstyle-8.17-all.jar → ...ipsecs.checkstyle/checkstyle-8.18-all.jar b/...ipsecs.checkstyle/checkstyle-8.17-all.jar → ...ipsecs.checkstyle/checkstyle-8.18-all.jar
diff --git a/...checkstyle/checkstyle-checkstyle-8.17.zip → ...checkstyle/checkstyle-checkstyle-8.18.zip b/...checkstyle/checkstyle-checkstyle-8.17.zip → ...checkstyle/checkstyle-checkstyle-8.18.zip
diff --git a/...kstyle/metadata/com/puppycrawl/tools/checkstyle/checks/annotation/checkstyle-metadata.xml b/...kstyle/metadata/com/puppycrawl/tools/checkstyle/checks/annotation/checkstyle-metadata.xml
@@ -105,15 +105,9 @@
                     <property-value-option value="METHOD_DEF" />
                     <property-value-option value="CTOR_DEF" />
                     <property-value-option value="VARIABLE_DEF" />
-                    <property-value-option value="TYPECAST" />
-                    <property-value-option value="DOT" />
-                    <property-value-option value="TYPE_ARGUMENT" />
                     <property-value-option value="ANNOTATION_DEF" />
                     <property-value-option value="ANNOTATION_FIELD_DEF" />
-                    <property-value-option value="LITERAL_NEW" />
-                    <property-value-option value="LITERAL_THROWS" />
                     <property-value-option value="PARAMETER_DEF" />
-                    <property-value-option value="IMPLEMENTS_CLAUSE" />
                 </enumeration>
             </property-metadata>
             <property-metadata name="allowSamelineSingleParameterlessAnnotation" datatype="Boolean"

diff --git a/...yle/metadata/com/puppycrawl/tools/checkstyle/checks/coding/checkstyle-metadata.properties b/...yle/metadata/com/puppycrawl/tools/checkstyle/checks/coding/checkstyle-metadata.properties
@@ -79,7 +79,7 @@ IllegalTokenText.name       = Illegal Tokens Text
 IllegalTokenText.tokens     = Tokens to check.
 
 IllegalType.desc                    = Checks that particular class are never used as types in variable declarations, return values or parameters. Includes a pattern check that by default disallows abstract classes.<br/>\r\nRationale: Helps reduce coupling on concrete classes. In addition abstract classes should be thought of a convenience base class implementations of interfaces and as such are not types themselves.
-IllegalType.format                  = pattern for illegal class name
+IllegalType.illegalAbstractClassNameFormat = pattern for illegal class name
 IllegalType.ignoredMethodNames      = methods that should not be checked.
 IllegalType.illegalClassNames       = classes that should not be used as types in variable declarations, return values or parameters.
 IllegalType.legalAbstractClassNames = abstract classes that may be used as types.

diff --git a/...checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/coding/checkstyle-metadata.xml b/...checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/coding/checkstyle-metadata.xml
@@ -247,8 +247,8 @@
             <property-metadata name="ignoredMethodNames" datatype="String" default-value="getInitialContext, getEnvironment">
                 <description>%IllegalType.ignoredMethodNames</description>
             </property-metadata>
-            <property-metadata name="format" datatype="Regex" default-value="^(.*[\.])?Abstract.*$">
-                <description>%IllegalType.format</description>
+            <property-metadata name="illegalAbstractClassNameFormat" datatype="Regex" default-value="^(.*[\.])?Abstract.*$">
+                <description>%IllegalType.illegalAbstractClassNameFormat</description>
             </property-metadata>
             <property-metadata name="memberModifiers" datatype="MultiCheck">
                 <description>%IllegalType.memberModifiers</description>

diff --git a/...heckstyle/metadata/com/puppycrawl/tools/checkstyle/filters/checkstyle-metadata.properties b/...heckstyle/metadata/com/puppycrawl/tools/checkstyle/filters/checkstyle-metadata.properties
@@ -43,3 +43,11 @@ SuppressionXpathFilter.name = Suppression Xpath Filter
 SuppressionXpathFilter.desc = Filter SuppressionXpathFilter works as SuppressionFilter. Additionally, filter processes suppress-xpath elements, which contains xpath-expressions. Xpath-expressions are queries for suppressed nodes inside the AST tree.
 SuppressionXpathFilter.file =  the location of the suppressions XML document file. The order the location is checked is:<ol><li>as a filesystem location</li><li>if no file found, and the location starts with either http:// or https://, then it is interpreted as a URL</li><li>if no file found, then passed to the ClassLoader.getResource() method.</li></ol>
 SuppressionXpathFilter.optional = Tells what to do when the file is not existing. If optional is set to false the file must exist, or else it ends with error. On the other hand if optional is true and file is not found, the filter accept all audit events.
+
+SuppressionXpathSingleFilter.name = Suppression Xpath Single Filter
+SuppressionXpathSingleFilter.desc =  Filter SuppressionXpathSingleFilter suppresses audit events for Checks violations in the specified file, class, checks, message, module id, and xpath.<p>Rationale: To allow users use suppressions configured in the same config with other modules. SuppressionFilter and SuppressionXpathFilter are require separate file.</p><p>Advice: If checkstyle configuration is used for several projects, single suppressions on common files/folders is better to put in checkstyle configuration as common rule. All suppression that are for specific file names is better to keep in project specific config file.</p><p>Attention: This filter only supports single suppression, and will need multiple instances if users wants to suppress multiple violations.</p> 
+SuppressionXpathSingleFilter.files = a Regular Expression matched against the file name associated with an audit event
+SuppressionXpathSingleFilter.checks = a Regular Expression matched against the name of the check associated with an audit event.
+SuppressionXpathSingleFilter.message = a Regular Expression matched against the message of the check associated with an audit event.
+SuppressionXpathSingleFilter.id = a string matched against the ID of the check associated with an audit event.
+SuppressionXpathSingleFilter.query = a string xpath query.
diff --git a/...psecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/filters/checkstyle-metadata.xml b/...psecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/filters/checkstyle-metadata.xml
@@ -118,6 +118,27 @@
                 <description>%SuppressionXpathFilter.optional</description>
             </property-metadata>
         </rule-metadata>
+
+        <rule-metadata name="%SuppressionXpathSingleFilter.name" internal-name="SuppressionXpathSingleFilter" parent="TreeWalker"
+            hasSeverity="false">
+            <alternative-name internal-name="com.puppycrawl.tools.checkstyle.filters.SuppressionXpathSingleFilter"/>
+            <description>%SuppressionXpathSingleFilter.desc</description>
+            <property-metadata name="files" datatype="Regex">
+                <description>%SuppressionXpathSingleFilter.files</description>
+            </property-metadata>
+            <property-metadata name="checks" datatype="Regex">
+                <description>%SuppressionXpathSingleFilter.checks</description>
+            </property-metadata>
+            <property-metadata name="message" datatype="Regex">
+                <description>%SuppressionXpathSingleFilter.message</description>
+            </property-metadata>
+            <property-metadata name="id" datatype="String">
+                <description>%SuppressionXpathSingleFilter.id</description>
+            </property-metadata>
+            <property-metadata name="query" datatype="String">
+                <description>%SuppressionXpathSingleFilter.query</description>
+            </property-metadata>
+        </rule-metadata>
     </rule-group-metadata>
 
 </checkstyle-metadata>