Skip to content

Commit 266b85d

Browse files
committed
#135 Update to Checkstyle 8.18
1 parent 7796f8f commit 266b85d

File tree

10 files changed

+35
-12
lines changed

10 files changed

+35
-12
lines changed

net.sf.eclipsecs.checkstyle/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry exported="true" kind="lib" path="checkstyle-8.17-all.jar" sourcepath="checkstyle-checkstyle-8.17.zip"/>
3+
<classpathentry exported="true" kind="lib" path="checkstyle-8.18-all.jar" sourcepath="checkstyle-checkstyle-8.18.zip"/>
44
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
55
<attributes>
66
<attribute name="maven.pomderived" value="true"/>

net.sf.eclipsecs.checkstyle/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ Export-Package: .,
4646
com.puppycrawl.tools.checkstyle.utils,
4747
org.apache.commons.beanutils;version="8.17.0"
4848
Bundle-ClassPath: .,
49-
checkstyle-8.17-all.jar
49+
checkstyle-8.18-all.jar
5050
Automatic-Module-Name: net.sf.eclipsecs.checkstyle
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
bin.includes = META-INF/,\
22
.,\
33
license/,\
4-
checkstyle-8.17-all.jar
4+
checkstyle-8.18-all.jar
55
jars.compile.order = .
66
source.. = metadata/

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/annotation/checkstyle-metadata.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,9 @@
105105
<property-value-option value="METHOD_DEF" />
106106
<property-value-option value="CTOR_DEF" />
107107
<property-value-option value="VARIABLE_DEF" />
108-
<property-value-option value="TYPECAST" />
109-
<property-value-option value="DOT" />
110-
<property-value-option value="TYPE_ARGUMENT" />
111108
<property-value-option value="ANNOTATION_DEF" />
112109
<property-value-option value="ANNOTATION_FIELD_DEF" />
113-
<property-value-option value="LITERAL_NEW" />
114-
<property-value-option value="LITERAL_THROWS" />
115110
<property-value-option value="PARAMETER_DEF" />
116-
<property-value-option value="IMPLEMENTS_CLAUSE" />
117111
</enumeration>
118112
</property-metadata>
119113
<property-metadata name="allowSamelineSingleParameterlessAnnotation" datatype="Boolean"

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/coding/checkstyle-metadata.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ IllegalTokenText.name = Illegal Tokens Text
7979
IllegalTokenText.tokens = Tokens to check.
8080
8181
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.
82-
IllegalType.format = pattern for illegal class name
82+
IllegalType.illegalAbstractClassNameFormat = pattern for illegal class name
8383
IllegalType.ignoredMethodNames = methods that should not be checked.
8484
IllegalType.illegalClassNames = classes that should not be used as types in variable declarations, return values or parameters.
8585
IllegalType.legalAbstractClassNames = abstract classes that may be used as types.

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/coding/checkstyle-metadata.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@
247247
<property-metadata name="ignoredMethodNames" datatype="String" default-value="getInitialContext, getEnvironment">
248248
<description>%IllegalType.ignoredMethodNames</description>
249249
</property-metadata>
250-
<property-metadata name="format" datatype="Regex" default-value="^(.*[\.])?Abstract.*$">
251-
<description>%IllegalType.format</description>
250+
<property-metadata name="illegalAbstractClassNameFormat" datatype="Regex" default-value="^(.*[\.])?Abstract.*$">
251+
<description>%IllegalType.illegalAbstractClassNameFormat</description>
252252
</property-metadata>
253253
<property-metadata name="memberModifiers" datatype="MultiCheck">
254254
<description>%IllegalType.memberModifiers</description>

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/filters/checkstyle-metadata.properties

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,11 @@ SuppressionXpathFilter.name = Suppression Xpath Filter
4343
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.
4444
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>
4545
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.
46+
47+
SuppressionXpathSingleFilter.name = Suppression Xpath Single Filter
48+
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>
49+
SuppressionXpathSingleFilter.files = a Regular Expression matched against the file name associated with an audit event
50+
SuppressionXpathSingleFilter.checks = a Regular Expression matched against the name of the check associated with an audit event.
51+
SuppressionXpathSingleFilter.message = a Regular Expression matched against the message of the check associated with an audit event.
52+
SuppressionXpathSingleFilter.id = a string matched against the ID of the check associated with an audit event.
53+
SuppressionXpathSingleFilter.query = a string xpath query.

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/filters/checkstyle-metadata.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,27 @@
118118
<description>%SuppressionXpathFilter.optional</description>
119119
</property-metadata>
120120
</rule-metadata>
121+
122+
<rule-metadata name="%SuppressionXpathSingleFilter.name" internal-name="SuppressionXpathSingleFilter" parent="TreeWalker"
123+
hasSeverity="false">
124+
<alternative-name internal-name="com.puppycrawl.tools.checkstyle.filters.SuppressionXpathSingleFilter"/>
125+
<description>%SuppressionXpathSingleFilter.desc</description>
126+
<property-metadata name="files" datatype="Regex">
127+
<description>%SuppressionXpathSingleFilter.files</description>
128+
</property-metadata>
129+
<property-metadata name="checks" datatype="Regex">
130+
<description>%SuppressionXpathSingleFilter.checks</description>
131+
</property-metadata>
132+
<property-metadata name="message" datatype="Regex">
133+
<description>%SuppressionXpathSingleFilter.message</description>
134+
</property-metadata>
135+
<property-metadata name="id" datatype="String">
136+
<description>%SuppressionXpathSingleFilter.id</description>
137+
</property-metadata>
138+
<property-metadata name="query" datatype="String">
139+
<description>%SuppressionXpathSingleFilter.query</description>
140+
</property-metadata>
141+
</rule-metadata>
121142
</rule-group-metadata>
122143

123144
</checkstyle-metadata>

0 commit comments

Comments
 (0)