[activemq-artemis] branch master updated: NO-JIRA checkstyle upgrade

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[activemq-artemis] branch master updated: NO-JIRA checkstyle upgrade

clebertsuconic-2
This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 4a4442e  NO-JIRA checkstyle upgrade
     new c8a165e  This closes #2880
4a4442e is described below

commit 4a4442ed565f6aff6679707d8992623dbd455f83
Author: Justin Bertram <[hidden email]>
AuthorDate: Thu Oct 31 09:23:05 2019 -0500

    NO-JIRA checkstyle upgrade
---
 .../activemq/artemis/jms/client/ActiveMQMessage.java      | 15 +++++----------
 .../client/compatible1X/ActiveMQCompatibleMessage.java    | 15 +++++----------
 etc/checkstyle.xml                                        |  4 +---
 pom.xml                                                   |  6 +++---
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
index 6a6292b..7cc6c47 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
@@ -140,18 +140,15 @@ public class ActiveMQMessage implements javax.jms.Message {
       ActiveMQMessage msg;
 
       switch (type) {
-         case ActiveMQMessage.TYPE: // 0
-         {
+         case ActiveMQMessage.TYPE: { // 0
             msg = new ActiveMQMessage(message, session);
             break;
          }
-         case ActiveMQBytesMessage.TYPE: // 4
-         {
+         case ActiveMQBytesMessage.TYPE: { // 4
             msg = new ActiveMQBytesMessage(message, session);
             break;
          }
-         case ActiveMQMapMessage.TYPE: // 5
-         {
+         case ActiveMQMapMessage.TYPE: { // 5
             msg = new ActiveMQMapMessage(message, session);
             break;
          }
@@ -159,13 +156,11 @@ public class ActiveMQMessage implements javax.jms.Message {
             msg = new ActiveMQObjectMessage(message, session, options);
             break;
          }
-         case ActiveMQStreamMessage.TYPE: // 6
-         {
+         case ActiveMQStreamMessage.TYPE: { // 6
             msg = new ActiveMQStreamMessage(message, session);
             break;
          }
-         case ActiveMQTextMessage.TYPE: // 3
-         {
+         case ActiveMQTextMessage.TYPE: { // 3
             msg = new ActiveMQTextMessage(message, session);
             break;
          }
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/compatible1X/ActiveMQCompatibleMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/compatible1X/ActiveMQCompatibleMessage.java
index 9248e8e..51f34c5 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/compatible1X/ActiveMQCompatibleMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/compatible1X/ActiveMQCompatibleMessage.java
@@ -164,18 +164,15 @@ public class ActiveMQCompatibleMessage extends ActiveMQMessage {
       ActiveMQMessage msg;
 
       switch (type) {
-         case ActiveMQMessage.TYPE: // 0
-         {
+         case ActiveMQMessage.TYPE: { // 0
             msg = new ActiveMQCompatibleMessage(message, session);
             break;
          }
-         case ActiveMQBytesMessage.TYPE: // 4
-         {
+         case ActiveMQBytesMessage.TYPE: { // 4
             msg = new ActiveMQBytesCompatibleMessage(message, session);
             break;
          }
-         case ActiveMQMapMessage.TYPE: // 5
-         {
+         case ActiveMQMapMessage.TYPE: { // 5
             msg = new ActiveMQMapCompatibleMessage(message, session);
             break;
          }
@@ -183,13 +180,11 @@ public class ActiveMQCompatibleMessage extends ActiveMQMessage {
             msg = new ActiveMQObjectCompatibleMessage(message, session, options);
             break;
          }
-         case ActiveMQStreamMessage.TYPE: // 6
-         {
+         case ActiveMQStreamMessage.TYPE: { // 6
             msg = new ActiveMQStreamCompatibleMessage(message, session);
             break;
          }
-         case ActiveMQTextMessage.TYPE: // 3
-         {
+         case ActiveMQTextMessage.TYPE: { // 3
             msg = new ActiveMQTextCompatibleMessage(message, session);
             break;
          }
diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
index f695bef..c1c6aec 100644
--- a/etc/checkstyle.xml
+++ b/etc/checkstyle.xml
@@ -64,9 +64,7 @@ under the License.
       <!-- Checks the style of array type definitions. -->
       <module name="ArrayTypeStyle"/>
       <!-- Make sure left curly braces are on the same line. -->
-      <module name="LeftCurly">
-         <property name="maxLineLength" value="100"/>
-      </module>
+      <module name="LeftCurly"/>
 
       <module name="RightCurly"/>
       <module name="RightCurly">
diff --git a/pom.xml b/pom.xml
index 873feb4..35ce4ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1561,17 +1561,17 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>2.17</version>
+            <version>3.0.0</version>
             <dependencies>
                <dependency>
                   <groupId>com.github.sevntu-checkstyle</groupId>
                   <artifactId>sevntu-checkstyle-maven-plugin</artifactId>
-                  <version>1.24.0</version>
+                  <version>1.29.0</version>
                </dependency>
                <dependency>
                   <groupId>com.puppycrawl.tools</groupId>
                   <artifactId>checkstyle</artifactId>
-                  <version>7.7</version>
+                  <version>8.18</version>
                </dependency>
             </dependencies>
             <configuration>