From 4050994e3053a0054fb3328cadef19807a431051 Mon Sep 17 00:00:00 2001 From: Tomas Bjerre Date: Sun, 19 Jan 2020 09:19:23 +0100 Subject: [PATCH 1/2] Spotbugs, PMD and Checkstyle #33 --- modules/openapi-generator-cli/pom.xml | 27 ++++++ modules/openapi-generator-core/pom.xml | 32 ++++++ .../openapi-generator-gradle-plugin/pom.xml | 25 +++++ .../openapi-generator-maven-plugin/pom.xml | 27 ++++++ modules/openapi-generator-online/pom.xml | 27 ++++++ modules/openapi-generator/pom.xml | 27 ++++++ pom.xml | 97 +++++++++++++++++++ spotbugs-exclude.xml | 25 +++++ 8 files changed, 287 insertions(+) create mode 100644 spotbugs-exclude.xml diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index 6aa9eb42defc..027ea7e76ab2 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -26,6 +26,33 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${project.basedir}/../../google_checkstyle.xml + + + + com.github.spotbugs + spotbugs-maven-plugin + + ${project.basedir}/../../spotbugs-exclude.xml + + + + org.apache.maven.plugins + maven-pmd-plugin + + + se.bjurr.violations + violations-maven-plugin + + + 274 + + org.apache.maven.plugins maven-jar-plugin diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index 58e2f5714d2d..d8585d7e60b7 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -16,6 +16,38 @@ openapi-generator-core https://github.com/openapitools/openapi-generator + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${project.basedir}/../../google_checkstyle.xml + + + + com.github.spotbugs + spotbugs-maven-plugin + + ${project.basedir}/../../spotbugs-exclude.xml + + + + org.apache.maven.plugins + maven-pmd-plugin + + + se.bjurr.violations + violations-maven-plugin + + + 571 + + + + + com.google.guava diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 3508398624dd..2cc5325f12c8 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -65,6 +65,31 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${project.basedir}/../../google_checkstyle.xml + + + + com.github.spotbugs + spotbugs-maven-plugin + + ${project.basedir}/../../spotbugs-exclude.xml + + + + org.apache.maven.plugins + maven-pmd-plugin + + + se.bjurr.violations + violations-maven-plugin + + 0 + + org.fortasoft diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index d74b8ff56243..af0233f1e9a7 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -89,6 +89,33 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${project.basedir}/../../google_checkstyle.xml + + + + com.github.spotbugs + spotbugs-maven-plugin + + ${project.basedir}/../../spotbugs-exclude.xml + + + + org.apache.maven.plugins + maven-pmd-plugin + + + se.bjurr.violations + violations-maven-plugin + + + 329 + + net.revelc.code formatter-maven-plugin diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 1d50a9c70f49..8fa09cedc466 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -42,6 +42,33 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${project.basedir}/../../google_checkstyle.xml + + + + com.github.spotbugs + spotbugs-maven-plugin + + ${project.basedir}/../../spotbugs-exclude.xml + + + + org.apache.maven.plugins + maven-pmd-plugin + + + se.bjurr.violations + violations-maven-plugin + + + 153 + + org.springframework.boot spring-boot-maven-plugin diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index 69f0314bb62a..d44bf58b0b87 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -43,6 +43,33 @@ target ${project.artifactId}-${project.version} + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${project.basedir}/../../google_checkstyle.xml + + + + com.github.spotbugs + spotbugs-maven-plugin + + ${project.basedir}/../../spotbugs-exclude.xml + + + + org.apache.maven.plugins + maven-pmd-plugin + + + se.bjurr.violations + violations-maven-plugin + + + 12089 + + org.codehaus.mojo exec-maven-plugin diff --git a/pom.xml b/pom.xml index 2bfd23742cf7..8f941ad5a48c 100644 --- a/pom.xml +++ b/pom.xml @@ -100,6 +100,66 @@ target ${project.artifactId}-${project.version} + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.0 + + false + false + + + + checkstyle-check + + check + + verify + + + + + com.github.spotbugs + spotbugs-maven-plugin + 3.1.12.2 + + false + max + + **/generated/*.java + + + + + spotbugs-check + + check + + verify + + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.12.0 + + false + false + + category/java/errorprone.xml + + + + + pmd-check + + check + + verify + + + net.revelc.code formatter-maven-plugin @@ -360,6 +420,43 @@ + + se.bjurr.violations + violations-maven-plugin + 1.33 + + 0 + VERBOSE + + + FINDBUGS + Spotbugs + ${project.basedir} + .*/spotbugsXml\.xml$ + + + PMD + PMD + ${project.basedir} + .*/pmd\.xml$ + + + CHECKSTYLE + Checkstyle + ${project.basedir} + .*/checkstyle-result\.xml$ + + + + + + verify + + violations + + + + net.revelc.code formatter-maven-plugin diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml new file mode 100644 index 000000000000..562eca9ee223 --- /dev/null +++ b/spotbugs-exclude.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From b7c33ec0156a4a6596846fdd54f0cddd3bfe0fee Mon Sep 17 00:00:00 2001 From: Tomas Bjerre Date: Sun, 19 Jan 2020 16:07:20 +0100 Subject: [PATCH 2/2] Reducing Spotbugs effort to min #33 * Also using project.parent.basedir and avoiding relative paths in pom files. * Filtering out samples. --- .gitignore | 2 ++ modules/openapi-generator-cli/pom.xml | 9 ++------- modules/openapi-generator-core/pom.xml | 9 ++------- modules/openapi-generator-gradle-plugin/pom.xml | 7 ++----- modules/openapi-generator-maven-plugin/pom.xml | 9 ++------- modules/openapi-generator-online/pom.xml | 6 +++--- modules/openapi-generator/pom.xml | 6 +++--- pom.xml | 14 +++++++++----- 8 files changed, 25 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 81c33b22aac5..36dfef78c283 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,8 @@ packages/ .vagrant/ .vscode/ **/.vs +bin +.factorypath .settings diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index 027ea7e76ab2..0120e7149be9 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -30,14 +30,14 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${project.basedir}/../../google_checkstyle.xml + ${project.parent.basedir}${file.separator}google_checkstyle.xml com.github.spotbugs spotbugs-maven-plugin - ${project.basedir}/../../spotbugs-exclude.xml + ${project.parent.basedir}${file.separator}spotbugs-exclude.xml @@ -47,11 +47,6 @@ se.bjurr.violations violations-maven-plugin - - - 274 - org.apache.maven.plugins diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index d8585d7e60b7..fafeb1bb25cc 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -22,14 +22,14 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${project.basedir}/../../google_checkstyle.xml + ${project.parent.basedir}${file.separator}google_checkstyle.xml com.github.spotbugs spotbugs-maven-plugin - ${project.basedir}/../../spotbugs-exclude.xml + ${project.parent.basedir}${file.separator}spotbugs-exclude.xml @@ -39,11 +39,6 @@ se.bjurr.violations violations-maven-plugin - - - 571 - diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 2cc5325f12c8..2d53bc49a5c8 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -69,14 +69,14 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${project.basedir}/../../google_checkstyle.xml + ${project.parent.basedir}${file.separator}google_checkstyle.xml com.github.spotbugs spotbugs-maven-plugin - ${project.basedir}/../../spotbugs-exclude.xml + ${project.parent.basedir}${file.separator}spotbugs-exclude.xml @@ -86,9 +86,6 @@ se.bjurr.violations violations-maven-plugin - - 0 - diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index af0233f1e9a7..5002686f5b9a 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -93,14 +93,14 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${project.basedir}/../../google_checkstyle.xml + ${project.parent.basedir}${file.separator}google_checkstyle.xml com.github.spotbugs spotbugs-maven-plugin - ${project.basedir}/../../spotbugs-exclude.xml + ${project.parent.basedir}${file.separator}spotbugs-exclude.xml @@ -110,11 +110,6 @@ se.bjurr.violations violations-maven-plugin - - - 329 - net.revelc.code diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 8fa09cedc466..7a798a6c0352 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -46,14 +46,14 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${project.basedir}/../../google_checkstyle.xml + ${project.parent.basedir}${file.separator}google_checkstyle.xml com.github.spotbugs spotbugs-maven-plugin - ${project.basedir}/../../spotbugs-exclude.xml + ${project.parent.basedir}${file.separator}spotbugs-exclude.xml @@ -66,7 +66,7 @@ - 153 + 3 diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index d44bf58b0b87..5a741c42cf1d 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -47,14 +47,14 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${project.basedir}/../../google_checkstyle.xml + ${project.parent.basedir}${file.separator}google_checkstyle.xml com.github.spotbugs spotbugs-maven-plugin - ${project.basedir}/../../spotbugs-exclude.xml + ${project.parent.basedir}${file.separator}spotbugs-exclude.xml @@ -67,7 +67,7 @@ - 12089 + 65 diff --git a/pom.xml b/pom.xml index 8f941ad5a48c..1e79f7b84f74 100644 --- a/pom.xml +++ b/pom.xml @@ -107,6 +107,7 @@ false false + **/samples/*.java @@ -124,10 +125,9 @@ 3.1.12.2 false - max - - **/generated/*.java - + + min + **/samples/*.java @@ -149,6 +149,9 @@ category/java/errorprone.xml + + **/samples/*.java + @@ -423,10 +426,11 @@ se.bjurr.violations violations-maven-plugin - 1.33 + 1.34 0 VERBOSE + ERROR FINDBUGS