Author: gk Date: Wed Jan 5 14:39:17 2022 New Revision: 1896714 URL: http://svn.apache.org/viewvc?rev=1896714&view=rev Log: - fix & update checkstyle to v8.45.1, as checking fails and jenkins complains: [WARNING] Old version of checkstyle detected. Consider updating to >= v8.30 and job resulted in failure.
Modified: db/torque/trunk/pom.xml db/torque/trunk/src/main/checkstyle/checkstyle.xml Modified: db/torque/trunk/pom.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1896714&r1=1896713&r2=1896714&view=diff ============================================================================== --- db/torque/trunk/pom.xml (original) +++ db/torque/trunk/pom.xml Wed Jan 5 14:39:17 2022 @@ -526,6 +526,13 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>3.1.2</version> + <dependencies> + <dependency> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <version>8.45.1</version> + </dependency> + </dependencies> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> Modified: db/torque/trunk/src/main/checkstyle/checkstyle.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/src/main/checkstyle/checkstyle.xml?rev=1896714&r1=1896713&r2=1896714&view=diff ============================================================================== --- db/torque/trunk/src/main/checkstyle/checkstyle.xml (original) +++ db/torque/trunk/src/main/checkstyle/checkstyle.xml Wed Jan 5 14:39:17 2022 @@ -18,66 +18,71 @@ under the License. --> -<!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.2//EN" - "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> -<!-- +<!DOCTYPE module PUBLIC + "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd"> - Checkstyle configuration that checks the sun coding conventions from: + <module name="Checker"> + + <!-- + Checkstyle configuration that checks the sun coding conventions from: - the Java Language Specification at - http://java.sun.com/docs/books/jls/second_edition/html/index.html + https://docs.oracle.com/javase/specs/jls/se11/html/index.html - - the Sun Code Conventions at http://java.sun.com/docs/codeconv/ + - the Sun Code Conventions at https://www.oracle.com/java/technologies/javase/codeconventions-contents.html - the Javadoc guidelines at - http://java.sun.com/j2se/javadoc/writingdoccomments/index.html + https://www.oracle.com/technical-resources/articles/java/javadoc-tool.html - - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html + - the JDK Api documentation https://docs.oracle.com/en/java/javase/11/ - some best practices - Checkstyle is very configurable. Be sure to read the documentation at - http://checkstyle.sf.net (or in your downloaded distribution). - - Most Checks are configurable, be sure to consult the documentation. + Checkstyle is very configurable. Be sure to read the documentation at + https://checkstyle.org (or in your downloaded distribution). - To completely disable a check, just comment it out or delete it from the file. + Most Checks are configurable, be sure to consult the documentation. - Finally, it is worth reading the documentation. - ---> + To completely disable a check, just comment it out or delete it from the file. + To suppress certain violations please review suppression filters. -<module name="Checker"> + Finally, it is worth reading the documentation. + --> + <property name="severity" value="warning"/> <property name="localeCountry" value="US" /> <property name="localeLanguage" value="en" /> + + <property name="cacheFile" value="${checkstyle.cache.file}"/> + <property name="tabWidth" value="4"/> + <module name="SuppressionFilter"> - <property name="file" value="${checkstyle.suppressions.file}"/> + <property name="file" value="${checkstyle.suppressions.file}"/> </module> - <!-- + <!-- Checks that a package documentation exists for each package. --> - <!-- See http://checkstyle.sf.net/config_javadoc.html --> + <!-- See https://checkstyle.sourceforge.io/config_javadoc.html --> <module name="JavadocPackage"> <property name="allowLegacy" value="true"/> </module> <!-- Checks whether files end with a new line. --> - <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile --> + <!-- See https://checkstyle.sourceforge.io/config_misc.html#NewlineAtEndOfFile --> <module name="NewlineAtEndOfFile"> - <property name="lineSeparator" value="lf"/> + <property name="lineSeparator" value="lf"/> </module> <!-- Checks that property files contain the same keys. --> - <!-- See http://checkstyle.sf.net/config_misc.html#Translation --> + <!-- See https://checkstyle.sourceforge.io/config_misc.html#Translation --> <module name="Translation"/> <!-- Checks for Headers --> - <!-- See http://checkstyle.sf.net/config_header.html --> + <!-- See https://checkstyle.sourceforge.io/config_header.html --> <module name="Header"> <!-- The follow property value demonstrates the ability --> <!-- to have access to ANT properties. In this case it uses --> @@ -88,43 +93,42 @@ </module> <!-- Checks for Size Violations. --> - <!-- See http://checkstyle.sf.net/config_sizes.html --> + <!-- See https://checkstyle.sourceforge.io/config_sizes.html --> <module name="FileLength"/> <!-- Checks for whitespace --> - <!-- See http://checkstyle.sf.net/config_whitespace.html --> + <!-- See https://checkstyle.sourceforge.io/config_whitespace.html --> <module name="FileTabCharacter"/> + <module name="LineLength"> + <property name="ignorePattern" value="^(import.*|(\*|\s)*@version.*)$"/> + <property name="max" value="132"/> + </module> + <module name="TreeWalker"> - <property name="cacheFile" value="${checkstyle.cache.file}"/> - <!-- ************************************************************** --> <!-- Checks that are different from the sun coding conventions ones --> <!-- ************************************************************** --> - <property name="tabWidth" value="4"/> + <module name="LeftCurly"> - <property name="option" value="nl"/> + <property name="option" value="nl"/> </module> <module name="RightCurly"> - <property name="option" value="alone"/> - </module> - <module name="LineLength"> - <property name="ignorePattern" value="^(import.*|(\*|\s)*@version.*)$"/> - <property name="max" value="132"/> + <property name="option" value="alone"/> </module> <module name="MemberName"> - <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/> + <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/> </module> <module name="StaticVariableName"> - <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/> + <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/> </module> <module name="ConstantName"> - <property name="format" value="^(([A-Z][A-Z0-9]*(_[A-Z0-9]+)*)|log)$"/> + <property name="format" value="^(([A-Z][A-Z0-9]*(_[A-Z0-9]+)*)|log)$"/> </module> <module name="ParameterName"> - <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/> + <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/> </module> <!-- ************************************************************** --> @@ -132,17 +136,20 @@ <!-- ************************************************************** --> <!-- Checks for Javadoc comments. --> - <!-- See http://checkstyle.sf.net/config_javadoc.html --> + <!-- See https://checkstyle.sourceforge.io/config_javadoc.html --> <module name="JavadocMethod"> - <property name="excludeScope" value="private"/> - <property name="allowUndeclaredRTE" value="true" /> </module> + + <module name="JavadocStyle"> + <property name="excludeScope" value="private"/> + </module> + <module name="JavadocType"/> <module name="JavadocVariable"/> <!-- Checks for Naming Conventions. --> - <!-- See http://checkstyle.sf.net/config_naming.html --> + <!-- See https://checkstyle.sourceforge.io/config_naming.html --> <module name="LocalFinalVariableName"/> <module name="LocalVariableName"/> <module name="MethodName"/> @@ -151,7 +158,7 @@ <!-- Checks for imports --> - <!-- See http://checkstyle.sf.net/config_import.html --> + <!-- See https://checkstyle.sourceforge.io/config_import.html --> <module name="AvoidStarImport"/> <module name="IllegalImport"/> <!-- defaults to sun.* packages --> <module name="RedundantImport"/> @@ -159,13 +166,13 @@ <!-- Checks for Size Violations. --> - <!-- See http://checkstyle.sf.net/config_sizes.html --> + <!-- See https://checkstyle.sourceforge.io/config_sizes.html --> <module name="MethodLength"/> <module name="ParameterNumber"/> <!-- Checks for whitespace --> - <!-- See http://checkstyle.sf.net/config_whitespace.html --> + <!-- See https://checkstyle.sourceforge.io/config_whitespace.html --> <module name="EmptyForIteratorPad"/> <module name="NoWhitespaceAfter"/> <module name="NoWhitespaceBefore"/> @@ -177,55 +184,54 @@ <!-- Modifier Checks --> - <!-- See http://checkstyle.sf.net/config_modifiers.html --> + <!-- See https://checkstyle.sourceforge.io/config_modifiers.html --> <module name="ModifierOrder"/> <module name="RedundantModifier"/> <!-- Checks for blocks. You know, those {}'s --> - <!-- See http://checkstyle.sf.net/config_blocks.html --> + <!-- See https://checkstyle.sourceforge.io/config_blocks.html --> <module name="EmptyBlock"/> <module name="NeedBraces"/> <!-- Checks for common coding problems --> - <!-- See http://checkstyle.sf.net/config_coding.html --> + <!-- See https://checkstyle.sourceforge.io/config_coding.html --> <module name="EmptyStatement"/> <module name="EqualsHashCode"/> <module name="FallThrough"/> <module name="HiddenField"> - <property name="tokens" value="VARIABLE_DEF"/> + <property name="tokens" value="VARIABLE_DEF"/> </module> <module name="IllegalInstantiation"/> <module name="InnerAssignment"/> <module name="MagicNumber"/> <module name="MissingSwitchDefault"/> -<!-- <module name="OneMethodPrivateField" /> --> - <module name="RedundantThrows"/> + <!-- <module name="OneMethodPrivateField" /> --> + <!-- <module name="RedundantThrows"/> --> <module name="SimplifyBooleanExpression"/> <module name="SimplifyBooleanReturn"/> <!-- Checks for class design --> - <!-- See http://checkstyle.sf.net/config_design.html --> + <!-- See https://checkstyle.sourceforge.io/config_design.html --> <module name="FinalClass"/> <module name="HideUtilityClassConstructor"/> <module name="VisibilityModifier"> - <module name="MissingSwitchDefault"/> - <property name="protectedAllowed" value="true"/> + <property name="protectedAllowed" value="true"/> </module> <!-- Miscellaneous other checks. --> - <!-- See http://checkstyle.sf.net/config_misc.html --> + <!-- See https://checkstyle.sourceforge.io/config_misc.html --> <module name="ArrayTypeStyle"/> <module name="Regexp"> - <property name="format" value="[ \t]+$"/> - <property name="illegalPattern" value="true"/> - <property name="message" value="Line has trailing spaces."/> + <property name="format" value="[ \t]+$"/> + <property name="illegalPattern" value="true"/> + <property name="message" value="Line has trailing spaces."/> </module> <module name="TodoComment"/> <module name="UpperEll"/> - + </module> -</module> +</module> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org