From 3690597d025f053d2914637a26bba893824742a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Mon, 3 Jan 2022 11:14:08 +0100 Subject: [PATCH] update to gradle 7.3.2, update to checkstyle 9.2.1, update to pmd 6.41.0 --- build.gradle | 4 +-- gradle.properties | 3 ++- gradle/config/checkstyle/checkstyle.xml | 34 ++++++++++++------------ gradle/quality/checkstyle.gradle | 20 ++++---------- gradle/quality/pmd.gradle | 3 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 28 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index 531c506..702ed44 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { id "de.marcphilipp.nexus-publish" version "0.4.0" id "io.codearte.nexus-staging" version "0.21.1" - id "org.xbib.gradle.plugin.asciidoctor" version "1.5.6.0.1" - id "com.github.spotbugs" version "4.2.4" + id "org.xbib.gradle.plugin.asciidoctor" version "2.5.2.0" + id "com.github.spotbugs" version "5.0.3" id "pmd" id "checkstyle" } diff --git a/gradle.properties b/gradle.properties index e084716..c75c138 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,8 @@ group = org.xbib name = content version = 4.0.0 -gradle.wrapper.version = 6.6.1 +org.gradle.warning.mode = ALL +gradle.wrapper.version = 7.3.2 xbib.net.version = 2.1.1 xbib-datastructures.version = 1.0.0 jackson.version = 2.12.3 diff --git a/gradle/config/checkstyle/checkstyle.xml b/gradle/config/checkstyle/checkstyle.xml index 2321bcb..fa4396b 100644 --- a/gradle/config/checkstyle/checkstyle.xml +++ b/gradle/config/checkstyle/checkstyle.xml @@ -38,22 +38,6 @@ page at http://checkstyle.sourceforge.net/config.html --> Only allows a package-info.java, not package.html. --> - - - - - - - - - - @@ -87,7 +71,7 @@ page at http://checkstyle.sourceforge.net/config.html --> - + @@ -316,5 +300,21 @@ page at http://checkstyle.sourceforge.net/config.html --> + + + + + + + + + + diff --git a/gradle/quality/checkstyle.gradle b/gradle/quality/checkstyle.gradle index e42e014..3e046e4 100644 --- a/gradle/quality/checkstyle.gradle +++ b/gradle/quality/checkstyle.gradle @@ -1,27 +1,17 @@ apply plugin: 'checkstyle' checkstyle { - toolVersion '8.33' + toolVersion '9.2.1' showViolations = true ignoreFailures = true configFile rootProject.file("gradle/config/checkstyle/checkstyle.xml") } -checkstyleMain { - exclude "**/module-info.java" - logging.setLevel(LogLevel.LIFECYCLE) - source ='src/main/java' -} - -checkstyleTest { - exclude "**/module-info.java" - logging.setLevel(LogLevel.LIFECYCLE) - source ='src/test/java' -} - tasks.withType(Checkstyle) { + exclude "**/module-info.java" + logging.setLevel(LogLevel.LIFECYCLE) reports { - xml.enabled false - html.enabled true + xml.required = false + html.required = true } } \ No newline at end of file diff --git a/gradle/quality/pmd.gradle b/gradle/quality/pmd.gradle index d20868b..f80d0b0 100644 --- a/gradle/quality/pmd.gradle +++ b/gradle/quality/pmd.gradle @@ -3,7 +3,6 @@ apply plugin: 'pmd' pmd { ignoreFailures = true consoleOutput = false - toolVersion = "6.24.0" - rulePriority = 5 + toolVersion = "6.41.0" ruleSetFiles = rootProject.files('gradle/config/pmd/category/java/bestpractices.xml') } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 33682bb..ac0b842 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists