This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 7922248 RATIS-1559. Update checkstyle to avoid the vulnerability in
8.18. (#628)
7922248 is described below
commit 79222481b53302041a6e6417739f5c91e7119a1a
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Fri Mar 25 23:20:40 2022 +0800
RATIS-1559. Update checkstyle to avoid the vulnerability in 8.18. (#628)
---
dev-support/checkstyle.xml | 9 ++++++---
pom.xml | 6 +++---
ratis-metrics/src/test/resources/hadoop-metrics2.properties | 5 +++--
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/dev-support/checkstyle.xml b/dev-support/checkstyle.xml
index 80e1411..6f8ac9f 100644
--- a/dev-support/checkstyle.xml
+++ b/dev-support/checkstyle.xml
@@ -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"/>
@@ -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"/>
diff --git a/pom.xml b/pom.xml
index 0638992..420416f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
diff --git a/ratis-metrics/src/test/resources/hadoop-metrics2.properties
b/ratis-metrics/src/test/resources/hadoop-metrics2.properties
index 3482888..fdec0fa 100644
--- a/ratis-metrics/src/test/resources/hadoop-metrics2.properties
+++ b/ratis-metrics/src/test/resources/hadoop-metrics2.properties
@@ -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,
