Skip to content

Commit

Permalink
RATIS-1559. Update checkstyle to avoid the vulnerability in 8.18. (#628)
Browse files Browse the repository at this point in the history
  • Loading branch information
szetszwo authored Mar 25, 2022
1 parent 0dcd2c1 commit 7922248
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
9 changes: 6 additions & 3 deletions dev-support/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@
<!-- <property name="fileExtensions" value="java"/> -->
<!-- </module> -->

<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html#LineLength -->
<module name="LineLength">
<property name="max" value="120"/>
</module>

<module name="TreeWalker">
<module name="SuppressWarningsHolder"/>
<module name="SuppressionCommentFilter"/>
Expand Down Expand Up @@ -133,9 +139,6 @@

<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="LineLength">
<property name="max" value="120"/>
</module>
<module name="MethodLength"/>
<module name="ParameterNumber">
<property name="ignoreOverriddenMethods" value="true"/>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,14 @@

<!-- Maven plugin versions -->
<maven-bundle-plugin.version>2.5.3</maven-bundle-plugin.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
<maven-clover2-plugin.version>3.3.0</maven-clover2-plugin.version>
<maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version>
<maven-pdf-plugin.version>1.2</maven-pdf-plugin.version>
<maven-stylus-skin.version>1.5</maven-stylus-skin.version>
<maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>

<checkstyle.version>9.3</checkstyle.version>

<protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version>
<license-maven-plugin.version>1.19</license-maven-plugin.version>
Expand Down Expand Up @@ -214,8 +216,6 @@
<!-- number of threads/forks to use when running tests in parallel, see parallel-tests profile -->
<testsThreadCount>4</testsThreadCount>

<checkstyle.version>8.18</checkstyle.version>

<!--metrics-->
<dropwizard.version>3.2.5</dropwizard.version>
</properties>
Expand Down
5 changes: 3 additions & 2 deletions ratis-metrics/src/test/resources/hadoop-metrics2.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
# Either will be loaded by the metrics system (but not both).
#
# NOTE: The metrics system is only initialized once per JVM (but does ref-counting, so we can't
#shutdown and restart), so we only load the first prefix that we find. Generally, this will be
# ratis_log_service_metadata/ratis_log_service/ratis (unless someone else registers first, but for many clients, there should only be one).
# shutdown and restart), so we only load the first prefix that we find. Generally, this will be
# ratis_log_service_metadata/ratis_log_service/ratis (unless someone else registers first,
# but for many clients, there should only be one).
#
# Usually, you would use hadoop-metrics2-phoenix.properties, but we use the generic
# hadoop-metrics2.properties to ensure it these are loaded regardless of where we are running,
Expand Down

0 comments on commit 7922248

Please sign in to comment.