activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-1188: Update sevntu to 1.24.0 available in maven central
Date Tue, 30 May 2017 13:55:53 GMT
ARTEMIS-1188: Update sevntu to 1.24.0 available in maven central

remove custom repo
update groupid to match artifact in maven central.
bump version also to that now deployed to maven central.
bump checkstyle version to 7.7 to make compatible.

updated checkstyle.xml to ignore existing issues which are prolific 
which are now flagged in latest version as some bugs in previous meant they we'ren't detected
e.g. https://github.com/checkstyle/checkstyle/issues/3320

fixing some violations which are not too prolific.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b8ebe057
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b8ebe057
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b8ebe057

Branch: refs/heads/master
Commit: b8ebe0577504fa0b2c39471f36656a0fe0ad59bd
Parents: c4663d8
Author: Michael Andre Pearce <Michael.Andre.Pearce@me.com>
Authored: Mon May 29 21:48:19 2017 +0100
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Tue May 30 09:54:17 2017 -0400

----------------------------------------------------------------------
 .../activemq/artemis/util/ServerUtil.java       |  3 +--
 .../settings/impl/ResourceLimitSettings.java    | 20 ++++++++++++++++++++
 etc/checkstyle.xml                              |  6 ++++--
 pom.xml                                         | 17 +++++++----------
 4 files changed, 32 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b8ebe057/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
index 0a22d0f..50d8524 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
@@ -93,8 +93,7 @@ public class ServerUtil {
          try (ActiveMQConnectionFactory cf = ActiveMQJMSClient.createConnectionFactory(uri,
null)) {
             cf.createConnection().close();
             System.out.println("server " + uri + " started");
-         }
-         catch (Exception e) {
+         } catch (Exception e) {
             System.out.println("awaiting server " + uri + " start at ");
             Thread.sleep(500);
             continue;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b8ebe057/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/ResourceLimitSettings.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/ResourceLimitSettings.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/ResourceLimitSettings.java
index 4e6c418..e8c0aae 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/ResourceLimitSettings.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/ResourceLimitSettings.java
@@ -142,6 +142,26 @@ public class ResourceLimitSettings implements Serializable, EncodingSupport
{
       return result;
    }
 
+   @Override
+   public boolean equals(Object o) {
+      if (this == o) {
+         return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+         return false;
+      }
+
+      ResourceLimitSettings that = (ResourceLimitSettings) o;
+
+      if (match != null ? !match.equals(that.match) : that.match != null) {
+         return false;
+      }
+      if (maxConnections != null ? !maxConnections.equals(that.maxConnections) : that.maxConnections
!= null) {
+         return false;
+      }
+      return maxQueues != null ? maxQueues.equals(that.maxQueues) : that.maxQueues == null;
+   }
+
    /* (non-Javadoc)
     * @see java.lang.Object#toString()
     */

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b8ebe057/etc/checkstyle.xml
----------------------------------------------------------------------
diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
index f695bef..c08f585 100644
--- a/etc/checkstyle.xml
+++ b/etc/checkstyle.xml
@@ -46,7 +46,9 @@ under the License.
 
       <!-- Modifier Checks -->
       <module name="ModifierOrder"/>
-      <module name="RedundantModifier"/>
+      <module name="RedundantModifier">
+         <property name="tokens" value="ANNOTATION_FIELD_DEF, INTERFACE_DEF, CLASS_DEF,
ENUM_DEF"/>
+      </module>
 
       <!-- Checks for common coding problems -->
       <module name="EmptyStatement"/>
@@ -71,7 +73,7 @@ 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, METHOD_DEF, CTOR_DEF, LITERAL_FOR,
LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
       </module>
       <!-- Checks that there is no whitespace after certain tokens; e.g. "." and "!".
-->
       <module name="NoWhitespaceAfter"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b8ebe057/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 01f22de..a437fa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1249,9 +1249,14 @@
             <version>2.17</version>
             <dependencies>
                <dependency>
-                  <groupId>com.github.sevntu.checkstyle</groupId>
+                  <groupId>com.github.sevntu-checkstyle</groupId>
                   <artifactId>sevntu-checkstyle-maven-plugin</artifactId>
-                  <version>1.21.0</version>
+                  <version>1.24.0</version>
+               </dependency>
+               <dependency>
+                  <groupId>com.puppycrawl.tools</groupId>
+                  <artifactId>checkstyle</artifactId>
+                  <version>7.7</version>
                </dependency>
             </dependencies>
             <configuration>
@@ -1446,12 +1451,4 @@
       </plugins>
    </reporting>
 
-   <pluginRepositories>
-      <pluginRepository>
-          <id>sevntu-maven</id>
-          <name>sevntu-maven</name>
-          <url>http://sevntu-checkstyle.github.io/sevntu.checkstyle/maven2</url>
-      </pluginRepository>
-   </pluginRepositories>
-
 </project>


Mime
View raw message