From 83c1841cd6ef11de10f465441ddd042d1076544a Mon Sep 17 00:00:00 2001 From: Benjamin Muschko Date: Sun, 6 Nov 2016 08:10:12 -0500 Subject: [PATCH] Integrated Checkstyle and FindBugs --- build.gradle | 3 +- gradle/checkstyle.gradle | 17 ++++ gradle/code-analysis.gradle | 27 ------ gradle/findbugs.gradle | 16 ++++ sun_checks.xml | 178 ++++++++++++++++++++++++++++++++++++ 5 files changed, 213 insertions(+), 28 deletions(-) create mode 100644 gradle/checkstyle.gradle delete mode 100644 gradle/code-analysis.gradle create mode 100644 gradle/findbugs.gradle create mode 100644 sun_checks.xml diff --git a/build.gradle b/build.gradle index 63b5541b..afd39a4a 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,8 @@ subprojects { apply from: "$rootProject.projectDir/gradle/java.gradle" apply from: "$rootProject.projectDir/gradle/junit-jupiter.gradle" apply from: "$rootProject.projectDir/gradle/jmh.gradle" - apply from: "$rootProject.projectDir/gradle/code-analysis.gradle" + apply from: "$rootProject.projectDir/gradle/checkstyle.gradle" + apply from: "$rootProject.projectDir/gradle/findbugs.gradle" apply plugin: 'com.mindviewinc.tagging' } diff --git a/gradle/checkstyle.gradle b/gradle/checkstyle.gradle new file mode 100644 index 00000000..68c9d1c5 --- /dev/null +++ b/gradle/checkstyle.gradle @@ -0,0 +1,17 @@ +apply plugin: 'checkstyle' + +checkstyle { + ignoreFailures = true + configFile = new File(rootProject.projectDir, 'sun_checks.xml') +} + +tasks.withType(Checkstyle) { + reports { + xml.enabled = false + html.enabled = true + } +} + +task checkstyle { + dependsOn tasks.withType(Checkstyle) +} \ No newline at end of file diff --git a/gradle/code-analysis.gradle b/gradle/code-analysis.gradle deleted file mode 100644 index db50436b..00000000 --- a/gradle/code-analysis.gradle +++ /dev/null @@ -1,27 +0,0 @@ -//apply plugin: 'checkstyle' -//apply plugin: 'findbugs' - - // See: http://blog.jessitron.com/2012/07/using-checkstyle-in-gradle.html - // https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml - // http://checkstyle.sourceforge.net/reports/google-java-style.html -/* checkstyle { - // configFile = new File(rootDir, "checkstyle.xml") - toolVersion = '6.7' - }*/ - -/* findbugsMain { - reports { - xml.enabled = false - html.enabled = true - } - ignoreFailures = true - } - - findbugsJmh { - reports { - xml.enabled = false - html.enabled = true - } - ignoreFailures = true - } -*/ \ No newline at end of file diff --git a/gradle/findbugs.gradle b/gradle/findbugs.gradle new file mode 100644 index 00000000..7ae0b51b --- /dev/null +++ b/gradle/findbugs.gradle @@ -0,0 +1,16 @@ +apply plugin: 'findbugs' + +findbugs { + ignoreFailures = true +} + +tasks.withType(FindBugs) { + reports { + xml.enabled = false + html.enabled = true + } +} + +task findbugs { + dependsOn tasks.withType(FindBugs) +} \ No newline at end of file diff --git a/sun_checks.xml b/sun_checks.xml new file mode 100644 index 00000000..34380c59 --- /dev/null +++ b/sun_checks.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file