From commits-return-63585-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Thu Jun 10 20:01:19 2021 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-ec2-va.apache.org (mxout1-ec2-va.apache.org [3.227.148.255]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 0B36C18037A for ; Thu, 10 Jun 2021 22:01:19 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-ec2-va.apache.org (ASF Mail Server at mxout1-ec2-va.apache.org) with SMTP id 49FD143893 for ; Thu, 10 Jun 2021 20:01:18 +0000 (UTC) Received: (qmail 92525 invoked by uid 500); 10 Jun 2021 20:01:18 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 92516 invoked by uid 99); 10 Jun 2021 20:01:17 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jun 2021 20:01:17 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C586F81A86; Thu, 10 Jun 2021 20:01:17 +0000 (UTC) Date: Thu, 10 Jun 2021 20:01:17 +0000 To: "commits@activemq.apache.org" Subject: [activemq-artemis] branch main updated: ARTEMIS-3341: update checkstyle, use consistent plugin version, fix some issues or tweak config to allow existing style MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <162335527748.22631.11004341356919095822@gitbox.apache.org> From: robbie@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: activemq-artemis X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Oldrev: 88122e0cd1dc323c757a21f5f85dca22d48b2e06 X-Git-Newrev: dc7de893747b90b627d729f9f18a758bb4dad9d5 X-Git-Rev: dc7de893747b90b627d729f9f18a758bb4dad9d5 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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 encode(Object secret) throws Exception; default void init(Map 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. - + + + + + diff --git a/pom.xml b/pom.xml index 422906b..b460f96 100644 --- a/pom.xml +++ b/pom.xml @@ -99,6 +99,9 @@ 2.6.0 3.0.0-M3 5.1.2 + 3.1.1 + 1.39.0 + 8.29 3.9.0 2.1.2 4.1.65.Final @@ -1538,17 +1541,17 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + ${maven.checkstyle.plugin.version} com.github.sevntu-checkstyle - sevntu-checkstyle-maven-plugin - 1.29.0 + sevntu-checks + ${sevntu.checks.version} com.puppycrawl.tools checkstyle - 8.18 + ${checkstyle.version} @@ -1737,7 +1740,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.17 + ${maven.checkstyle.plugin.version} ${activemq.basedir}/etc/checkstyle.xml ${activemq.basedir}/etc/checkstyle-suppressions.xml