From bff18a5b8f2230ebe0d7290980d1743aac44ba46 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 18 Jan 2017 11:59:27 +0000 Subject: [PATCH 1/8] pom.xml: remove the findbugs plugin Replaced by Huntbugs --- README.md | 12 +++++------- pom.xml | 24 +----------------------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 66432b0..f8808c4 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ maven-compiler-plugin.version|3.5.1 maven-surefire-plugin.version|2.19.1 maven-failsafe-plugin.version|2.19.1 maven-pmd-plugin.version|3.6 -findbugs-maven-plugin.version|3.0.4 +huntbugs.version|0.0.11 jacoco-maven-plugin.version|0.7.7.201606060606 highwheel-maven.version|1.2 maven-project-info-reports-plugin.version|2.9 @@ -118,14 +118,12 @@ during the `verify` phase. No configuration applied beyond the defaults. -## Findbugs Maven Plugin +## Huntbugs Maven Plugin -The [Findbugs Maven Plugin](http://gleclaire.github.io/findbugs-maven-plugin/) -runs the [Findbugs](http://findbugs.sourceforge.net/factSheet.html) code -analysis. +The [Huntbugs Maven Plugin](https://github.com/amaembo/huntbugs) is a +static code analyser. -Runs its [check](http://gleclaire.github.io/findbugs-maven-plugin/check-mojo.html) -goal during the `verify` phase. +Runs during the `compile` phase. ### Configuration diff --git a/pom.xml b/pom.xml index dd2b663..d98110b 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,6 @@ 2.19.1 2.19.1 3.7 - 3.0.4 0.0.11 0.7.7.201606060606 1.2 @@ -257,28 +256,13 @@ - - org.codehaus.mojo - findbugs-maven-plugin - ${findbugs-maven-plugin.version} - - - check - verify - - check - - - - - one.util huntbugs-maven-plugin ${huntbugs.version} - verify + compile huntbugs @@ -390,12 +374,6 @@ true - - - org.codehaus.mojo - findbugs-maven-plugin - ${findbugs-maven-plugin.version} - From 22c3cbc9aca91bf4f67060f0865e416b6daf3cf0 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 18 Jan 2017 12:01:16 +0000 Subject: [PATCH 2/8] pom.xml: add digraph-dependency-maven-plugin (again) This time use the digraph-dependency.basePackage to configure the plugin. --- README.md | 5 +++-- pom.xml | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f8808c4..6034c10 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ checkstyle.version|7.1.1 sevntu-checkstyle-maven-plugin.version|1.21.0 kemitix-checkstyle-ruleset.version|1.0.0 maven-compiler-plugin.version|3.5.1 +digraph-dependency.version|0.7.0 maven-surefire-plugin.version|2.19.1 maven-failsafe-plugin.version|2.19.1 maven-pmd-plugin.version|3.6 @@ -208,9 +209,9 @@ generates a DOT file diagram showing the dependencies between packages in a proj ### Configuration -The plugin will generate the `target/digraph.dot` file during the `verify` phase. +The plugin will generate the `target/digraph.dot` file during the `validate` phase. -The plugin will filter to packages within the `net.kemitix` package namespace. +Set the `digraph-dependency.basePackage` property to the root package to graph. # Distribution Management diff --git a/pom.xml b/pom.xml index d98110b..c0d86b0 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,10 @@ 5-complexity 1.16.12 + + 0.7.0 + (UNSET:basePackage) + 2.10.4 3.0.1 1.6 @@ -193,6 +197,22 @@ + + net.kemitix + digraph-dependency-maven-plugin + ${digraph-dependency.version} + + ${digraph-dependency.basePackage} + + + + validate + + digraph + + + + org.apache.maven.plugins maven-compiler-plugin From 62452ff46344ef4ebb98aee966ed8adee4b54caa Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 18 Jan 2017 12:02:16 +0000 Subject: [PATCH 3/8] README.md: update versions to match pom.xml --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6034c10..f5fc9d3 100644 --- a/README.md +++ b/README.md @@ -32,11 +32,11 @@ maven-checkstyle-plugin.version|2.17 checkstyle.version|7.1.1 sevntu-checkstyle-maven-plugin.version|1.21.0 kemitix-checkstyle-ruleset.version|1.0.0 -maven-compiler-plugin.version|3.5.1 digraph-dependency.version|0.7.0 +maven-compiler-plugin.version|3.6.0 maven-surefire-plugin.version|2.19.1 maven-failsafe-plugin.version|2.19.1 -maven-pmd-plugin.version|3.6 +maven-pmd-plugin.version|3.7 huntbugs.version|0.0.11 jacoco-maven-plugin.version|0.7.7.201606060606 highwheel-maven.version|1.2 From 8347c8962a71c2b16f4a65995baafe31a65ac7f6 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 18 Jan 2017 12:03:03 +0000 Subject: [PATCH 4/8] pom.xml: highwheel runs after compile highwheel uses the compiled class files, so needs to be run after the compile phase. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0d86b0..a679821 100644 --- a/pom.xml +++ b/pom.xml @@ -353,7 +353,7 @@ ${highwheel-maven.version} - validate + compile analyse From 2516a17851fdabb54c00237d7f8adc9c9420f2fe Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 18 Jan 2017 12:04:44 +0000 Subject: [PATCH 5/8] README.md: use kemitix-checkstyle-ruleset-maven-plugin --- README.md | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index f5fc9d3..3b9a6c4 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,7 @@ maven-javadoc-plugin.version|2.10.4 maven-source-plugin.version|3.0.1 maven-gpg-plugin.version|1.6 maven-deploy-plugin.version|2.8.2 -maven-checkstyle-plugin.version|2.17 -checkstyle.version|7.1.1 -sevntu-checkstyle-maven-plugin.version|1.21.0 -kemitix-checkstyle-ruleset.version|1.0.0 +kemitix-checkstyle-ruleset.version|2.0.4 digraph-dependency.version|0.7.0 maven-compiler-plugin.version|3.6.0 maven-surefire-plugin.version|2.19.1 @@ -46,30 +43,24 @@ jacoco-class-line-covered-ratio|0.50 jacoco-class-instruction-covered-ratio|0.80 jacoco-class-missed-count-maximum|0 -## Maven Checkstyle Plugin +## Checkstyle -The [Maven Checkstyle Plugin](https://maven.apache.org/plugins/maven-checkstyle-plugin/) -uses the latest version of the Checkstyle library -([Release Notes](http://checkstyle.sourceforge.net/releasenotes.html)) and the -[Sevntu](http://sevntu-checkstyle.github.io/sevntu.checkstyle/) library. +The Checkstyle plugin is configured using the +`kemitix-checkstyle-ruleset-maven-plugin`. -As from version 2.0.0 you no longer provide a `checkstyle.xml` file. Any file you -provide will be ignored unless you re-configure the maven-checkstyle-plugin yourself. - -The ruleset that will be used is defined in -[kemitix-checkstyle-ruleset](https://github.com/kemitix/kemitix-checkstyle-ruleset). -See that project's `README.md` file for details on the ruleset. +The `kemitix-checkstyle-ruleset` provides five levels of checks. The +default is set to `5-complexity`, the most strict. ### Configuration -Ref [checkstyle:check](https://maven.apache.org/plugins/maven-checkstyle-plugin/check-mojo.html) +Set the property `kemitix-checkstyle-ruleset.level` to one of the +following values to select a less-strict ruleset: -* configLocation: [checkstyle.xml](https://github.com/kemitix/kemitix-checkstyle-ruleset/blob/master/src/main/resources/net/kemitix/checkstyle.xml) -* consoleOutput: true -* encoding: UTF-8 -* failOnViolation: true -* failOnError: true -* linkXRef: true +* 1-layout +* 2-naming +* 3-javadoc +* 4-tweaks +* 5-complexity ## Maven Compiler Plugin From ee2c489ca289b385b2cc0288958b1b2562ba2f63 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 18 Jan 2017 12:05:55 +0000 Subject: [PATCH 6/8] README.md: update documentation --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3b9a6c4..bcf6065 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ runs the [PMD](http://pmd.sourceforge.net/) code analysis. Runs its [pmd](https://maven.apache.org/plugins/maven-pmd-plugin/pmd-mojo.html) and [cpd](https://maven.apache.org/plugins/maven-pmd-plugin/cpd-mojo.html) goals -during the `verify` phase. +during the `compile` phase. ### Configuration @@ -138,13 +138,17 @@ For each class not excluded the Instructions Covered Ration must be at least Excluded from analysis: * `*Test` - test classes +* `*IT` - integration test classes +* `*Main` - main classes +* `*Application` - application classes +* `*Configuration` - (Spring) configuration classes ## Maven Source Plugin The [Maven Source Plugin](https://maven.apache.org/plugins/maven-source-plugin/) bundles your sources into a jar file ready for deployment. -Runs its [jar-no-fork](http://gleclaire.github.io/findbugs-maven-plugin/check-mojo.html) +Runs its [jar-no-fork](https://maven.apache.org/plugins/maven-source-plugin/jar-no-fork-mojo.html) goal during the `verify` phase. ### Configuration @@ -157,7 +161,7 @@ The [Maven Javadoc Plugin](https://maven.apache.org/plugins/maven-javadoc-plugin generates your html javadocs and bundles them into a jar file ready for deployment. -Runs its [jar-no-fork](http://gleclaire.github.io/findbugs-maven-plugin/check-mojo.html) +Runs its [jar](https://maven.apache.org/plugins/maven-javadoc-plugin/jar-mojo.html) goal during the `verify` phase. ### Configuration @@ -191,7 +195,7 @@ classes. ### Configuration -The plugin will `analyse` the project during the `verify` phase. +The plugin will `analyse` the project during the `compile` phase. ## Digraph Dependency Plugin From f28a0f2db4b05d7911f4bbe19c98e09a13ca19b0 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 8 Feb 2017 09:47:13 +0000 Subject: [PATCH 7/8] pom.xml: specify dependency management versions as properties --- pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a679821..1310ad1 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,8 @@ 5-complexity 1.16.12 + Athens-SR2 + Camden.SR4 0.7.0 (UNSET:basePackage) @@ -82,14 +84,14 @@ io.spring.platform platform-bom - Athens-SR2 + ${spring-platform.version} pom import org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + ${spring-cloud.version} pom import From e275ab502c430ad09c7101816adcc1736394386b Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Wed, 8 Feb 2017 12:41:17 +0000 Subject: [PATCH 8/8] pom.xml: upgrade kemitix-checkstyle-ruleset to 2.1.2 Includes checkstyle 7.5.1, so remove custom configuration. --- README.md | 5 +++-- pom.xml | 5 +---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bcf6065..40b3e0b 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ maven-javadoc-plugin.version|2.10.4 maven-source-plugin.version|3.0.1 maven-gpg-plugin.version|1.6 maven-deploy-plugin.version|2.8.2 -kemitix-checkstyle-ruleset.version|2.0.4 +kemitix-checkstyle-ruleset.version|2.1.2 digraph-dependency.version|0.7.0 maven-compiler-plugin.version|3.6.0 maven-surefire-plugin.version|2.19.1 @@ -49,7 +49,8 @@ The Checkstyle plugin is configured using the `kemitix-checkstyle-ruleset-maven-plugin`. The `kemitix-checkstyle-ruleset` provides five levels of checks. The -default is set to `5-complexity`, the most strict. +default is set to `5-complexity`, the most strict. It runs during the +`validate` phase. ### Configuration diff --git a/pom.xml b/pom.xml index 1310ad1..fa8a251 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ UTF-8 UTF-8 target - 2.0.4 + 2.1.2 5-complexity 1.16.12 @@ -187,9 +187,6 @@ net.kemitix kemitix-checkstyle-ruleset-maven-plugin ${kemitix-checkstyle-ruleset.version} - - 7.4 - validate