diff --git a/CHANGELOG b/CHANGELOG index d497997..76b9414 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,14 @@ CHANGELOG ========= +4.2.0 +----- + +* EmptyLineSeparator: disabled +* Upgrade `tiles-maven-plugin` to 2.11 +* Upgrade `checkstyle` to 8.10 +* Upgrade `sevntu-checkstyle` to 1.29.0 + 4.1.0 ----- diff --git a/README.md b/README.md index 99c48f1..a0d4d25 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The simplest way to use the ruleset is with the maven-tile: ```xml - 2.10 + 2.11 @@ -101,7 +101,7 @@ Rule|Level|Source|Enabled|Suppressible [EmptyCatchBlock](#emptycatchblock)|tweaks|checkstyle|Yes| [EmptyForInitializerPad](#emptyforinitializerpad)|layout|checkstyle|Yes| [EmptyForIteratorPad](#emptyforiteratorpad)|layout|checkstyle|Yes| -[EmptyLineSeparator](#emptylineseparator)|layout|checkstyle|Yes| +[EmptyLineSeparator](#emptylineseparator)|layout|checkstyle|| [EmptyPublicCtorInClass](#emptypublicctorinclass)|tweaks|sevntu|Yes| [EmptyStatement](#emptystatement)|layout|checkstyle|Yes| [EnumValueName](#enumvaluename)|naming|sevntu|Yes| @@ -768,59 +768,6 @@ Invalid: ```` for (Iterator i = list.getIterator(); i.hasNext() ; ) {} ```` -#### [EmptyLineSeparator](http://checkstyle.sourceforge.net/config_whitespace.html#EmptyLineSeparator) - -Checks that there are blank lines between header, package, import blocks, field, constructors, methods, nested classes, static initialisers and instance initialisers. - -Valid: -```` -/** - * Licence header. - */ - -package net.kemitix.foo; - -import ...; -import ...; - -class Foo { - - private int a; - - private int b; - - Foo() {} - - Foo(int a, int b) {} - - int getA() {} - - int getB() {} - - class Bar { - } -} -```` - -Invalid: -```` -/** - * Licence header. - */ -package net.kemitix.foo; -import ...; -import ...; -class Foo { - private int a; - private int b; - Foo() {} - Foo(int a, int b) {} - int getA() {} - int getB() {} - class Bar { - } -} -```` #### [EmptyStatement](http://checkstyle.sourceforge.net/config_coding.html#EmptyStatement) Checks for empty statements. An empty statement is a standalone semicolon (;). @@ -2643,6 +2590,9 @@ Ref: Clean Code, Robert C. Martin, J1: Avoid Long Import Lists by Using Wildcard Ref: Clean Code, Robert C. Martin, J2: Don't Inherit Constants Recommends using a static import to access constants from another class over inheriting them. +#### [EmptyLineSeparator](http://checkstyle.sourceforge.net/config_whitespace.html#EmptyLineSeparator) + + #### [FinalLocalVariable](http://checkstyle.sourceforge.net/config_coding.html#FinalLocalVariable) Doesn't recognise Lombok's `val` as being `final`. diff --git a/builder/pom.xml b/builder/pom.xml index 9c3c734..381d4d3 100644 --- a/builder/pom.xml +++ b/builder/pom.xml @@ -19,11 +19,11 @@ true 1.8 - 2.10 + 2.11 0.8.1 - 8.7 - 1.27.0 + 8.10 + 1.29.0 1.16.20 Brussels-SR6 1.5.9.RELEASE diff --git a/builder/src/main/resources/README-template.md b/builder/src/main/resources/README-template.md index 5aabff6..66ea631 100644 --- a/builder/src/main/resources/README-template.md +++ b/builder/src/main/resources/README-template.md @@ -20,7 +20,7 @@ The simplest way to use the ruleset is with the maven-tile: ```xml - 2.10 + 2.11 diff --git a/builder/src/main/resources/application.yml b/builder/src/main/resources/application.yml index 5d888f0..b4d99bb 100644 --- a/builder/src/main/resources/application.yml +++ b/builder/src/main/resources/application.yml @@ -241,9 +241,10 @@ rules: name: EmptyLineSeparator parent: TREEWALKER level: LAYOUT - enabled: true + enabled: false source: CHECKSTYLE uri: http://checkstyle.sourceforge.net/config_whitespace.html#EmptyLineSeparator + reason: - name: EmptyStatement parent: TREEWALKER diff --git a/regressions/pom.xml b/regressions/pom.xml index 8a18a88..dff6910 100644 --- a/regressions/pom.xml +++ b/regressions/pom.xml @@ -16,12 +16,12 @@ true - 2.10 + 2.11 0.8.1 1.8 - 8.7 - 1.27.0 + 8.10 + 1.29.0 3.0.0 ${project.version} diff --git a/ruleset/pom.xml b/ruleset/pom.xml index ca03294..1749725 100644 --- a/ruleset/pom.xml +++ b/ruleset/pom.xml @@ -21,7 +21,7 @@ https://github.com/kemitix/kemitix-checkstyle-ruleset - 2.10 + 2.11 0.8.1 3.0.2 diff --git a/ruleset/src/main/resources/net/kemitix/checkstyle-1-layout.xml b/ruleset/src/main/resources/net/kemitix/checkstyle-1-layout.xml index 4c5422e..5378d67 100644 --- a/ruleset/src/main/resources/net/kemitix/checkstyle-1-layout.xml +++ b/ruleset/src/main/resources/net/kemitix/checkstyle-1-layout.xml @@ -26,7 +26,6 @@ - diff --git a/ruleset/src/main/resources/net/kemitix/checkstyle-2-naming.xml b/ruleset/src/main/resources/net/kemitix/checkstyle-2-naming.xml index 8b7de69..4125034 100644 --- a/ruleset/src/main/resources/net/kemitix/checkstyle-2-naming.xml +++ b/ruleset/src/main/resources/net/kemitix/checkstyle-2-naming.xml @@ -32,7 +32,6 @@ - diff --git a/ruleset/src/main/resources/net/kemitix/checkstyle-3-javadoc.xml b/ruleset/src/main/resources/net/kemitix/checkstyle-3-javadoc.xml index 51a0531..2463ad3 100644 --- a/ruleset/src/main/resources/net/kemitix/checkstyle-3-javadoc.xml +++ b/ruleset/src/main/resources/net/kemitix/checkstyle-3-javadoc.xml @@ -38,7 +38,6 @@ - diff --git a/ruleset/src/main/resources/net/kemitix/checkstyle-4-tweaks.xml b/ruleset/src/main/resources/net/kemitix/checkstyle-4-tweaks.xml index d9dbcb1..c30f4f8 100644 --- a/ruleset/src/main/resources/net/kemitix/checkstyle-4-tweaks.xml +++ b/ruleset/src/main/resources/net/kemitix/checkstyle-4-tweaks.xml @@ -46,7 +46,6 @@ - diff --git a/ruleset/src/main/resources/net/kemitix/checkstyle-5-complexity.xml b/ruleset/src/main/resources/net/kemitix/checkstyle-5-complexity.xml index 75bdce0..374a07f 100644 --- a/ruleset/src/main/resources/net/kemitix/checkstyle-5-complexity.xml +++ b/ruleset/src/main/resources/net/kemitix/checkstyle-5-complexity.xml @@ -62,7 +62,6 @@ - diff --git a/tile/pom.xml b/tile/pom.xml index 0d21a6b..2aa533a 100644 --- a/tile/pom.xml +++ b/tile/pom.xml @@ -17,7 +17,7 @@ tile - 2.10 + 2.11 0.8.1 diff --git a/tile/tile.xml b/tile/tile.xml index 9229eda..057ec1c 100644 --- a/tile/tile.xml +++ b/tile/tile.xml @@ -1,8 +1,8 @@ 3.0.0 - 8.7 - 1.27.0 + 8.10 + 1.29.0 4.0.1 5-complexity net/kemitix/checkstyle-${kemitix.checkstyle.ruleset.level}.xml