You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2021/06/10 20:01:17 UTC
[activemq-artemis] branch main updated: ARTEMIS-3341: update
checkstyle, use consistent plugin version,
fix some issues or tweak config to allow existing style
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new dc7de89 ARTEMIS-3341: update checkstyle, use consistent plugin version, fix some issues or tweak config to allow existing style
dc7de89 is described below
commit dc7de893747b90b627d729f9f18a758bb4dad9d5
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jun 10 17:50:44 2021 +0100
ARTEMIS-3341: update checkstyle, use consistent plugin version, fix some issues or tweak config to allow existing style
---
.../apache/activemq/artemis/utils/SensitiveDataCodec.java | 2 +-
etc/checkstyle.xml | 6 +++++-
pom.xml | 13 ++++++++-----
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java
index cbd17e5..5f3c08a 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java
@@ -32,5 +32,5 @@ public interface SensitiveDataCodec<T> {
T encode(Object secret) throws Exception;
default void init(Map<String, String> params) throws Exception {
- };
+ }
}
diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
index c1c6aec..ede3c5a 100644
--- a/etc/checkstyle.xml
+++ b/etc/checkstyle.xml
@@ -69,7 +69,11 @@ under the License.
<module name="RightCurly"/>
<module name="RightCurly">
<property name="option" value="alone"/>
- <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
+ <property name="tokens" value="CLASS_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
+ </module>
+ <module name="RightCurly">
+ <property name="option" value="alone_or_singleline"/>
+ <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
</module>
<!-- Checks that there is no whitespace after certain tokens; e.g. "." and "!". -->
<module name="NoWhitespaceAfter"/>
diff --git a/pom.xml b/pom.xml
index 422906b..b460f96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,9 @@
<errorprone.version>2.6.0</errorprone.version>
<maven.enforcer.plugin.version>3.0.0-M3</maven.enforcer.plugin.version>
<maven.bundle.plugin.version>5.1.2</maven.bundle.plugin.version>
+ <maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version>
+ <sevntu.checks.version>1.39.0</sevntu.checks.version>
+ <checkstyle.version>8.29</checkstyle.version>
<mockito.version>3.9.0</mockito.version>
<jctools.version>2.1.2</jctools.version>
<netty.version>4.1.65.Final</netty.version>
@@ -1538,17 +1541,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.1</version>
+ <version>${maven.checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.github.sevntu-checkstyle</groupId>
- <artifactId>sevntu-checkstyle-maven-plugin</artifactId>
- <version>1.29.0</version>
+ <artifactId>sevntu-checks</artifactId>
+ <version>${sevntu.checks.version}</version>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.18</version>
+ <version>${checkstyle.version}</version>
</dependency>
</dependencies>
<configuration>
@@ -1737,7 +1740,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${maven.checkstyle.plugin.version}</version>
<configuration>
<configLocation>${activemq.basedir}/etc/checkstyle.xml</configLocation>
<suppressionsLocation>${activemq.basedir}/etc/checkstyle-suppressions.xml</suppressionsLocation>