Issue #169: update to Checkstyle 8.25

Author: Calixte

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.24-all.jar" sourcepath="checkstyle-checkstyle-8.24.zip"/>
+	<classpathentry exported="true" kind="lib" path="checkstyle-8.25-all.jar" sourcepath="checkstyle-checkstyle-8.25.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"/>

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.24.0"
 Bundle-ClassPath: .,
- checkstyle-8.24-all.jar
+ checkstyle-8.25-all.jar
 Automatic-Module-Name: net.sf.eclipsecs.checkstyle

net.sf.eclipsecs.checkstyle/build.properties

@@ -1,6 +1,6 @@
 bin.includes = META-INF/,\
                .,\
                license/,\
-               checkstyle-8.24-all.jar
+               checkstyle-8.25-all.jar
 jars.compile.order = .
 source.. = metadata/

net.sf.eclipsecs.checkstyle/checkstyle-8.24-all.jar renamed to net.sf.eclipsecs.checkstyle/checkstyle-8.25-all.jar

@@ -1,12 +1,9 @@
 
 Javadoc.group                              = Javadoc Comments
 
-JavadocMethod.minLineCount                 = Minimal amount of lines in method to demand documentation presence.
 JavadocMethod.allowedAnnotations           = List of annotations that could allow missed documentation.
 JavadocMethod.validateThrows               = Allows validating throws tags.
-JavadocMethod.allowMissingJavadoc          = Whether to ignore errors when a method javadoc is missed
 JavadocMethod.allowMissingParamTags        = Whether to ignore errors when a method has parameters but does not have matching param tags in the javadoc.
-JavadocMethod.allowMissingPropertyJavadoc  = Whether to allow missing Javadoc on accessor methods for properties (setters and getters).
 JavadocMethod.allowMissingReturnTag        = Whether to ignore errors when a method returns non-void type does have a return tag in the javadoc.
 JavadocMethod.allowMissingThrowsTags       = Whether to ignore errors when a method declares that it throws exceptions but does have matching throws tags in the javadoc.
 JavadocMethod.allowThrowsTagsForSubclasses = Whether to allow documented exceptions that are subclass of one of declared exception.
@@ -18,7 +15,6 @@ JavadocMethod.name                         = Method Javadoc
 JavadocMethod.scope                        = Visibility scope where Javadoc comments are checked.
 JavadocMethod.suppressLoadErrors           = Controls whether to show class loading errors in the checkstyle report.
 JavadocMethod.tokens                       = Tokens to check.
-JavadocMethod.ignoreMethodNamesRegex       = Ignore method whose names are matching specified regex.
 
 JavadocPackage.allowLegacy = If set then allow the use of a package.html file.
 JavadocPackage.desc        = Checks that each Java package has a Javadoc comment. By default it only allows a <code>package-info.java</code> file, but can be configured to allow a <code>package.html</code> file. \r\n<br/>\r\nAn error will be reported if both files exist as this is not allowed by the Javadoc tool. \r\n

net.sf.eclipsecs.checkstyle/checkstyle-checkstyle-8.24.zip renamed to net.sf.eclipsecs.checkstyle/checkstyle-checkstyle-8.25.zip

@@ -21,9 +21,6 @@
         <rule-metadata name="%JavadocMethod.name" internal-name="JavadocMethod" parent="TreeWalker">
             <alternative-name internal-name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck" />
             <description>%JavadocMethod.desc</description>
-            <property-metadata name="minLineCount" datatype="Integer" default-value="-1">
-                <description>%JavadocMethod.minLineCount</description>
-            </property-metadata>
             <property-metadata name="allowedAnnotations" datatype="String">
                 <description>%JavadocMethod.allowedAnnotations</description>
             </property-metadata>
@@ -53,12 +50,6 @@
             <property-metadata name="allowMissingReturnTag" datatype="Boolean" default-value="false">
                 <description>%JavadocMethod.allowMissingReturnTag</description>
             </property-metadata>
-            <property-metadata name="allowMissingJavadoc" datatype="Boolean" default-value="false">
-                <description>%JavadocMethod.allowMissingJavadoc</description>
-            </property-metadata>
-            <property-metadata name="allowMissingPropertyJavadoc" datatype="Boolean" default-value="false">
-                <description>%JavadocMethod.allowMissingPropertyJavadoc</description>
-            </property-metadata>
             <property-metadata name="logLoadErrors" datatype="Boolean" default-value="true">
                 <description>%JavadocMethod.logLoadErrors</description>
             </property-metadata>
@@ -74,9 +65,6 @@
                     <property-value-option value="ANNOTATION_FIELD_DEF" />
                 </enumeration>
             </property-metadata>
-            <property-metadata name="ignoreMethodNamesRegex" datatype="Regex">
-                <description>%JavadocMethod.ignoreMethodNamesRegex</description>
-            </property-metadata>
             <message-key key="javadoc.classInfo" />
             <message-key key="javadoc.unusedTagGeneral" />
             <message-key key="javadoc.invalidInheritDoc" />

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

@@ -8,6 +8,7 @@ RegexpMultiline.maximum    = The maximum number of matches required in each file
 RegexpMultiline.message    = message which is used to notify about violations, if empty then default(hard-coded) message is used.
 RegexpMultiline.minimum    = The minimum number of matches required in each file.
 RegexpMultiline.name       = RegexpMultiline
+RegexpMultiline.matchAcrossLines = Controls whether to match expressions across multiple lines.
 RegexpMultiline.fileExtensions = file type extension of files to process
 
 RegexpSingleline.desc               = A check for detecting single lines that match a supplied regular expression. Works with any file type.\r\n<br/><br/>\r\nRationale: This check can be used to prototype checks and to find common bad practice such as calling ex.printStacktrace(), System.out.println(), System.exit(), etc.

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

@@ -49,6 +49,9 @@
             <property-metadata name="maximum" datatype="Integer" default-value="0">
                 <description>%RegexpMultiline.maximum</description>
             </property-metadata>
+            <property-metadata name="matchAcrossLines" datatype="Boolean" default-value="false">
+                <description>%RegexpMultiline.matchAcrossLines</description>
+            </property-metadata>
             <property-metadata name="fileExtensions" datatype="String">
                 <description>%RegexpMultiline.fileExtensions</description>
             </property-metadata>

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

@@ -22,6 +22,7 @@
 
 import com.google.common.io.Closeables;
 import com.puppycrawl.tools.checkstyle.ConfigurationLoader;
+import com.puppycrawl.tools.checkstyle.ConfigurationLoader.IgnoredModulesOptions;
 import com.puppycrawl.tools.checkstyle.PropertyResolver;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 
@@ -96,7 +97,7 @@ public List<ResolvableProperty> getUnresolvedProperties() throws CheckstylePlugi
     InputSource in = null;
     try {
       in = configFile.getCheckConfigFileInputSource();
-      ConfigurationLoader.loadConfiguration(in, resolver, false);
+      ConfigurationLoader.loadConfiguration(in, resolver, IgnoredModulesOptions.EXECUTE);
     } catch (CheckstyleException e) {
       CheckstylePluginException.rethrow(e);
     } finally {