Merge branch 'hotfix/4.0.0' into develop
* hotfix/4.0.0: tile use tiles ruleset uses UTF-8 encoding Regressions use own checkstyle config Upgrade maven-checkstyle-plugin to 3.0.0 Update checkstyle groupId/artifactId/version in support modules Update travis-support Prevent installation of support modules Run builder during package phase Add local checkstyle plugin config for builder Change ruleset groupId/artifactId to net.kemitix.checkstyle.ruleset Simplify groupId and artifactId under net.kemitix.checkstyle Restore Header and JavadocPackage checks [bug] update the ruleset files and add missing reasons for deactivated rules Version set to 3.4.1
This commit is contained in:
commit
fb354b9902
6 changed files with 67 additions and 10 deletions
|
@ -9,6 +9,7 @@ CHANGELOG
|
||||||
4.0.0
|
4.0.0
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
* Upgrade to `maven-checkstyle-plugin` 3.0.0
|
||||||
* Change ruleset groupId/artifactId to `net.kemitix.checkstyle/ruleset`
|
* Change ruleset groupId/artifactId to `net.kemitix.checkstyle/ruleset`
|
||||||
* Add maven-tile `net.kemitix.checkstyle:tile`
|
* Add maven-tile `net.kemitix.checkstyle:tile`
|
||||||
* \[bug] update the ruleset files
|
* \[bug] update the ruleset files
|
||||||
|
|
|
@ -32,8 +32,8 @@
|
||||||
<mockito.version>2.13.0</mockito.version>
|
<mockito.version>2.13.0</mockito.version>
|
||||||
<assertj.version>3.9.0</assertj.version>
|
<assertj.version>3.9.0</assertj.version>
|
||||||
|
|
||||||
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
|
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
|
||||||
<kemitix.checkstyle.ruleset.version>3.4.0</kemitix.checkstyle.ruleset.version>
|
<kemitix.checkstyle.ruleset.version>${project.version}</kemitix.checkstyle.ruleset.version>
|
||||||
<kemitix.checkstyle.ruleset.level>5-complexity</kemitix.checkstyle.ruleset.level>
|
<kemitix.checkstyle.ruleset.level>5-complexity</kemitix.checkstyle.ruleset.level>
|
||||||
<kemitix.checkstyle.ruleset.location>net/kemitix/checkstyle-${kemitix.checkstyle.ruleset.level}.xml</kemitix.checkstyle.ruleset.location>
|
<kemitix.checkstyle.ruleset.location>net/kemitix/checkstyle-${kemitix.checkstyle.ruleset.level}.xml</kemitix.checkstyle.ruleset.location>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -166,8 +166,8 @@
|
||||||
<version>${sevntu.version}</version>
|
<version>${sevntu.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.kemitix</groupId>
|
<groupId>net.kemitix.checkstyle</groupId>
|
||||||
<artifactId>kemitix-checkstyle-ruleset</artifactId>
|
<artifactId>ruleset</artifactId>
|
||||||
<version>${kemitix.checkstyle.ruleset.version}</version>
|
<version>${kemitix.checkstyle.ruleset.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
|
@ -19,8 +19,14 @@
|
||||||
<tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
|
<tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
|
||||||
<kemitix-tiles.version>0.2.0</kemitix-tiles.version>
|
<kemitix-tiles.version>0.2.0</kemitix-tiles.version>
|
||||||
|
|
||||||
|
<checkstyle.version>8.6</checkstyle.version>
|
||||||
|
<sevntu.version>1.26.0</sevntu.version>
|
||||||
|
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
|
||||||
|
<kemitix.checkstyle.ruleset.version>${project.version}</kemitix.checkstyle.ruleset.version>
|
||||||
|
<!--<kemitix.checkstyle.ruleset.level>5-complexity</kemitix.checkstyle.ruleset.level>-->
|
||||||
<!-- use the disabled ruleset for normal builds. comment out the following line to check that conditions are caught -->
|
<!-- use the disabled ruleset for normal builds. comment out the following line to check that conditions are caught -->
|
||||||
<ruleset.level>0-disabled</ruleset.level>
|
<kemitix.checkstyle.ruleset.level>0-disabled</kemitix.checkstyle.ruleset.level>
|
||||||
|
<kemitix.checkstyle.ruleset.location>net/kemitix/checkstyle-${kemitix.checkstyle.ruleset.level}.xml</kemitix.checkstyle.ruleset.location>
|
||||||
<digraph-dependency.basePackage>net.kemitix.checkstyle.regressions</digraph-dependency.basePackage>
|
<digraph-dependency.basePackage>net.kemitix.checkstyle.regressions</digraph-dependency.basePackage>
|
||||||
<pitest.skip>true</pitest.skip>
|
<pitest.skip>true</pitest.skip>
|
||||||
<immutables-value.version>2.5.6</immutables-value.version>
|
<immutables-value.version>2.5.6</immutables-value.version>
|
||||||
|
@ -44,10 +50,44 @@
|
||||||
<extensions>true</extensions>
|
<extensions>true</extensions>
|
||||||
<configuration>
|
<configuration>
|
||||||
<tiles>
|
<tiles>
|
||||||
<tile>net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version}</tile>
|
<tile>net.kemitix.tiles:maven-plugins-tile:${kemitix-tiles.version}</tile>
|
||||||
|
<tile>net.kemitix.tiles:compiler-tile:${kemitix-tiles.version}</tile>
|
||||||
</tiles>
|
</tiles>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||||
|
<version>${maven-checkstyle-plugin.version}</version>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.puppycrawl.tools</groupId>
|
||||||
|
<artifactId>checkstyle</artifactId>
|
||||||
|
<version>${checkstyle.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.sevntu-checkstyle</groupId>
|
||||||
|
<artifactId>sevntu-checkstyle-maven-plugin</artifactId>
|
||||||
|
<version>${sevntu.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.kemitix.checkstyle</groupId>
|
||||||
|
<artifactId>ruleset</artifactId>
|
||||||
|
<version>${kemitix.checkstyle.ruleset.version}</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
<configuration>
|
||||||
|
<configLocation>${kemitix.checkstyle.ruleset.location}</configLocation>
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>verify</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>check</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
<properties>
|
<properties>
|
||||||
<tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
|
<tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
|
||||||
<kemitix-tiles.version>0.2.0</kemitix-tiles.version>
|
<kemitix-tiles.version>0.2.0</kemitix-tiles.version>
|
||||||
|
<maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<licenses>
|
<licenses>
|
||||||
|
@ -62,6 +63,14 @@
|
||||||
</tiles>
|
</tiles>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
|
<version>${maven-resources-plugin.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<encoding>UTF-8</encoding>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
|
<tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
|
||||||
|
<kemitix-tiles.version>0.2.0</kemitix-tiles.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -27,6 +28,12 @@
|
||||||
<artifactId>tiles-maven-plugin</artifactId>
|
<artifactId>tiles-maven-plugin</artifactId>
|
||||||
<version>${tiles-maven-plugin.version}</version>
|
<version>${tiles-maven-plugin.version}</version>
|
||||||
<extensions>true</extensions>
|
<extensions>true</extensions>
|
||||||
|
<configuration>
|
||||||
|
<tiles>
|
||||||
|
<tile>net.kemitix.tiles:maven-plugins-tile:${kemitix-tiles.version}</tile>
|
||||||
|
<tile>net.kemitix.tiles:release-tile:${kemitix-tiles.version}</tile>
|
||||||
|
</tiles>
|
||||||
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<project>
|
<project>
|
||||||
<properties>
|
<properties>
|
||||||
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
|
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
|
||||||
<checkstyle.version>8.6</checkstyle.version>
|
<checkstyle.version>8.6</checkstyle.version>
|
||||||
<sevntu.version>1.26.0</sevntu.version>
|
<sevntu.version>1.26.0</sevntu.version>
|
||||||
<kemitix.checkstyle.ruleset.version>3.4.0</kemitix.checkstyle.ruleset.version>
|
<kemitix.checkstyle.ruleset.version>4.0.0</kemitix.checkstyle.ruleset.version>
|
||||||
<kemitix.checkstyle.ruleset.level>5-complexity</kemitix.checkstyle.ruleset.level>
|
<kemitix.checkstyle.ruleset.level>5-complexity</kemitix.checkstyle.ruleset.level>
|
||||||
<kemitix.checkstyle.ruleset.location>net/kemitix/checkstyle-${kemitix.checkstyle.ruleset.level}.xml</kemitix.checkstyle.ruleset.location>
|
<kemitix.checkstyle.ruleset.location>net/kemitix/checkstyle-${kemitix.checkstyle.ruleset.level}.xml</kemitix.checkstyle.ruleset.location>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -25,8 +25,8 @@
|
||||||
<version>${sevntu.version}</version>
|
<version>${sevntu.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.kemitix</groupId>
|
<groupId>net.kemitix.checkstyle</groupId>
|
||||||
<artifactId>kemitix-checkstyle-ruleset</artifactId>
|
<artifactId>ruleset</artifactId>
|
||||||
<version>${kemitix.checkstyle.ruleset.version}</version>
|
<version>${kemitix.checkstyle.ruleset.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
Loading…
Reference in a new issue