Merge branch 'release/3.1.0' into develop

* release/3.1.0:
  version: set to 3.2.0-SNAPSHOT
  travis-ci: deploy even when from a pull request
  builder: ExplicitInitilization only applies to object references
  CHANGELOG
  version: set to 3.1.0
This commit is contained in:
Paul Campbell 2017-05-30 15:28:15 +01:00
commit ebf86a8235
15 changed files with 39 additions and 26 deletions

View file

@ -1,6 +1,17 @@
CHANGELOG
=========
3.1.0
-----
* Upgrade checkstyle to 7.8
* Upgrade sevntu to 1.24.0
* Add Rule: MoveVariableInsideIf
* Add Rule: ForbidWildcardAsReturnType
* Modify Rule: ExplicitInitialization only applies to objects
* Add Wercker CI
* Add Shippable CI
3.0.1
-----

View file

@ -903,13 +903,15 @@ Checks that when a class overrides the `equals()` method, that it also overrides
Limits the number of executable statements in a method to 30.
#### [ExplicitInitialization](http://checkstyle.sourceforge.net/config_coding.html#ExplicitInitialization)
Checks that fields are not being explicitly initialised to their already default value.
Checks that object fields are not being explicitly initialised to their already default value.
Does not check primitive field types.
Valid:
````
class Valid {
private int foo;
private int foo = 0;
private Object bar;
}
@ -919,7 +921,7 @@ Invalid:
````
class Invalid {
private int foo = 0;
private Integer foo = 0;
private Object bar = null;
}

View file

@ -12,7 +12,7 @@
</parent>
<artifactId>kemitix-checkstyle-ruleset-builder</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Kemitix Checkstyle Ruleset Builder</name>

View file

@ -275,6 +275,8 @@ rules:
enabled: true
source: CHECKSTYLE
uri: http://checkstyle.sourceforge.net/config_coding.html#ExplicitInitialization
properties:
onlyObjectReferences: true
-
name: FallThrough
parent: TREEWALKER

View file

@ -1,11 +1,13 @@
Checks that fields are not being explicitly initialised to their already default value.
Checks that object fields are not being explicitly initialised to their already default value.
Does not check primitive field types.
Valid:
````
class Valid {
private int foo;
private int foo = 0;
private Object bar;
}
@ -15,7 +17,7 @@ Invalid:
````
class Invalid {
private int foo = 0;
private Integer foo = 0;
private Object bar = null;
}

View file

@ -10,12 +10,12 @@
<parent>
<groupId>net.kemitix</groupId>
<artifactId>kemitix-checkstyle-ruleset-sample-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../sample-parent</relativePath>
</parent>
<artifactId>kemitix-checkstyle-ruleset-plugin-sample</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<name>Kemitix Checkstyle Ruleset Plugin Sample</name>
<description>Sample usage of the Kemitix Checkstyle Ruleset Plugin</description>

View file

@ -7,7 +7,7 @@
<parent>
<groupId>net.kemitix</groupId>
<artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>kemitix-checkstyle-ruleset-maven-plugin</artifactId>

View file

@ -6,7 +6,7 @@
<groupId>net.kemitix</groupId>
<artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Kemitix Checkstyle Ruleset (Parent)</name>

View file

@ -5,7 +5,7 @@
<parent>
<artifactId>kemitix-checkstyle-ruleset-sample-parent</artifactId>
<groupId>net.kemitix</groupId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../sample-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

View file

@ -29,16 +29,8 @@ package net.kemitix.checkstyle.regressions;
@SuppressWarnings("hideutilityclassconstructor")
class ExplicitInitialization {
/**
* This will become valid in next release.
*/
@SuppressWarnings("explicitinitialization")
private boolean validBoolean = false;
/**
* This will become valid in next release.
*/
@SuppressWarnings("explicitinitialization")
private int validInt = 0;
private String validString = "";

View file

@ -7,11 +7,11 @@
<parent>
<groupId>net.kemitix</groupId>
<artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>
<artifactId>kemitix-checkstyle-ruleset</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Kemitix Checkstyle Ruleset</name>

View file

@ -50,7 +50,9 @@
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyLineSeparatorCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.ExplicitInitializationCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.ExplicitInitializationCheck">
<property name="onlyObjectReferences" value="true"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"/>

View file

@ -69,7 +69,9 @@
<module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.sizes.ExecutableStatementCountCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.ExplicitInitializationCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.ExplicitInitializationCheck">
<property name="onlyObjectReferences" value="true"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck"/>

View file

@ -8,7 +8,7 @@
<artifactId>kemitix-checkstyle-ruleset-sample-parent</artifactId>
<packaging>pom</packaging>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<name>Kemitix Checkstyle Ruleset Sample Parent</name>
<description>Sample parent for modules that use kemitix-checkstyle-ruleset-maven-plugin</description>

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash
if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
if [ "$TRAVIS_BRANCH" = 'master' ]; then
echo "Preparing to deploy to nexus..."
openssl aes-256-cbc -K $encrypted_efec3258f55d_key -iv $encrypted_efec3258f55d_iv \
-in travis-ci/codesigning.asc.enc -out travis-ci/codesigning.asc -d