Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

(cherry picked from commit b8ebe05775)
This commit is contained in:
Michael Andre Pearce 2017-05-29 21:48:19 +01:00 committed by Clebert Suconic
parent ee3669e422
commit 2d850680d6
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/ResourceLimitSettings.java
View File

@ -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()
*/

6
etc/checkstyle.xml
View File

@ -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"/>

17
pom.xml
View File

@ -1217,9 +1217,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>
@ -1412,12 +1417,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>