From ea2c909a329e5939b737b57b0982cb40480701b2 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 19 Apr 2018 20:58:44 +0100 Subject: [PATCH 1/5] EmptyLineSeparator: disable --- CHANGELOG | 5 ++ README.md | 58 ++----------------- builder/src/main/resources/application.yml | 3 +- .../net/kemitix/checkstyle-1-layout.xml | 1 - .../net/kemitix/checkstyle-2-naming.xml | 1 - .../net/kemitix/checkstyle-3-javadoc.xml | 1 - .../net/kemitix/checkstyle-4-tweaks.xml | 1 - .../net/kemitix/checkstyle-5-complexity.xml | 1 - 8 files changed, 11 insertions(+), 60 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d497997..fab191b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,11 @@ CHANGELOG ========= +4.2.0 +----- + +* EmptyLineSeparator: disabled + 4.1.0 ----- diff --git a/README.md b/README.md index 99c48f1..c28a6cf 100644 --- a/README.md +++ b/README.md @@ -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/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/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 @@ - From 0b0f11430ebe411ee0e084fdf6b35b9ef05eab5a Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 19 Apr 2018 21:00:55 +0100 Subject: [PATCH 2/5] Upgrade tiles-maven-plugin to 2.11 --- CHANGELOG | 1 + README.md | 2 +- builder/pom.xml | 2 +- builder/src/main/resources/README-template.md | 2 +- regressions/pom.xml | 2 +- ruleset/pom.xml | 2 +- tile/pom.xml | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fab191b..4a4f833 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ CHANGELOG ----- * EmptyLineSeparator: disabled +* Upgrade `tiles-maven-plugin` to 2.11 4.1.0 ----- diff --git a/README.md b/README.md index c28a6cf..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 diff --git a/builder/pom.xml b/builder/pom.xml index 9c3c734..5cfb7dc 100644 --- a/builder/pom.xml +++ b/builder/pom.xml @@ -19,7 +19,7 @@ true 1.8 - 2.10 + 2.11 0.8.1 8.7 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/regressions/pom.xml b/regressions/pom.xml index 8a18a88..9f83fe9 100644 --- a/regressions/pom.xml +++ b/regressions/pom.xml @@ -16,7 +16,7 @@ true - 2.10 + 2.11 0.8.1 1.8 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/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 From c7e054ec8bc6de1fc6ff2c2666fd31be4b08deaf Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 19 Apr 2018 21:06:04 +0100 Subject: [PATCH 3/5] Upgrade `checkstyle` to 8.9 --- CHANGELOG | 1 + builder/pom.xml | 2 +- regressions/pom.xml | 2 +- tile/tile.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4a4f833..1ee9ab3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ CHANGELOG * EmptyLineSeparator: disabled * Upgrade `tiles-maven-plugin` to 2.11 +* Upgrade `checkstyle` to 8.9 4.1.0 ----- diff --git a/builder/pom.xml b/builder/pom.xml index 5cfb7dc..6514c05 100644 --- a/builder/pom.xml +++ b/builder/pom.xml @@ -22,7 +22,7 @@ 2.11 0.8.1 - 8.7 + 8.9 1.27.0 1.16.20 Brussels-SR6 diff --git a/regressions/pom.xml b/regressions/pom.xml index 9f83fe9..0e4b85d 100644 --- a/regressions/pom.xml +++ b/regressions/pom.xml @@ -20,7 +20,7 @@ 0.8.1 1.8 - 8.7 + 8.9 1.27.0 3.0.0 ${project.version} diff --git a/tile/tile.xml b/tile/tile.xml index 9229eda..842405a 100644 --- a/tile/tile.xml +++ b/tile/tile.xml @@ -1,7 +1,7 @@ 3.0.0 - 8.7 + 8.9 1.27.0 4.0.1 5-complexity From 435417587bcdbccbcbefd91845266b6168381320 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 19 Apr 2018 21:07:59 +0100 Subject: [PATCH 4/5] Upgrade `sevntu-checkstyle` to 1.29.0 --- CHANGELOG | 1 + builder/pom.xml | 2 +- regressions/pom.xml | 2 +- tile/tile.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1ee9ab3..cb81fbd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ CHANGELOG * EmptyLineSeparator: disabled * Upgrade `tiles-maven-plugin` to 2.11 * Upgrade `checkstyle` to 8.9 +* Upgrade `sevntu-checkstyle` to 1.29.0 4.1.0 ----- diff --git a/builder/pom.xml b/builder/pom.xml index 6514c05..23576d8 100644 --- a/builder/pom.xml +++ b/builder/pom.xml @@ -23,7 +23,7 @@ 0.8.1 8.9 - 1.27.0 + 1.29.0 1.16.20 Brussels-SR6 1.5.9.RELEASE diff --git a/regressions/pom.xml b/regressions/pom.xml index 0e4b85d..8daba1e 100644 --- a/regressions/pom.xml +++ b/regressions/pom.xml @@ -21,7 +21,7 @@ 1.8 8.9 - 1.27.0 + 1.29.0 3.0.0 ${project.version} diff --git a/tile/tile.xml b/tile/tile.xml index 842405a..6762523 100644 --- a/tile/tile.xml +++ b/tile/tile.xml @@ -2,7 +2,7 @@ 3.0.0 8.9 - 1.27.0 + 1.29.0 4.0.1 5-complexity net/kemitix/checkstyle-${kemitix.checkstyle.ruleset.level}.xml From 6acef3bf418fa0ab76e9966151a47410cb5d2d2e Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 20 Apr 2018 09:49:58 +0100 Subject: [PATCH 5/5] Upgrade to checkstyle 8.10 --- CHANGELOG | 2 +- builder/pom.xml | 2 +- regressions/pom.xml | 2 +- tile/tile.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index cb81fbd..76b9414 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,7 +6,7 @@ CHANGELOG * EmptyLineSeparator: disabled * Upgrade `tiles-maven-plugin` to 2.11 -* Upgrade `checkstyle` to 8.9 +* Upgrade `checkstyle` to 8.10 * Upgrade `sevntu-checkstyle` to 1.29.0 4.1.0 diff --git a/builder/pom.xml b/builder/pom.xml index 23576d8..381d4d3 100644 --- a/builder/pom.xml +++ b/builder/pom.xml @@ -22,7 +22,7 @@ 2.11 0.8.1 - 8.9 + 8.10 1.29.0 1.16.20 Brussels-SR6 diff --git a/regressions/pom.xml b/regressions/pom.xml index 8daba1e..dff6910 100644 --- a/regressions/pom.xml +++ b/regressions/pom.xml @@ -20,7 +20,7 @@ 0.8.1 1.8 - 8.9 + 8.10 1.29.0 3.0.0 ${project.version} diff --git a/tile/tile.xml b/tile/tile.xml index 6762523..057ec1c 100644 --- a/tile/tile.xml +++ b/tile/tile.xml @@ -1,7 +1,7 @@ 3.0.0 - 8.9 + 8.10 1.29.0 4.0.1 5-complexity