From b9ac9c6db35d4b3f7931d967de6ca34044ded8f3 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 23 Jul 2022 23:20:45 -0400 Subject: [PATCH 1/5] [ci] Formatting --- .../org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy index 5b8a5c41..d78034a8 100644 --- a/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy +++ b/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy @@ -537,7 +537,7 @@ abstract class BaseViolationCheckMojo extends AbstractMojo { log.info('\n\n\nTo see bug detail using the Spotbugs GUI, use the following command "mvn spotbugs:gui"\n\n\n') - if ( (bugCountAboveThreshold || errorCount) && failOnError ) { + if ((bugCountAboveThreshold || errorCount) && failOnError) { throw new MojoExecutionException("failed with ${bugCountAboveThreshold} bugs and ${errorCount} errors ") } } From 50bc8c9391e7c5fc79743353349138790924a12d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 23 Jul 2022 23:30:00 -0400 Subject: [PATCH 2/5] [ci] Move comment above line --- .../org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy index d78034a8..a9c58079 100644 --- a/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy +++ b/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy @@ -527,7 +527,8 @@ abstract class BaseViolationCheckMojo extends AbstractMojo { def logMsg = priorityName + ': ' + bug.LongMessage.text() + SpotBugsInfo.BLANK + bug.SourceLine.'@classname' + SpotBugsInfo.BLANK + bug.SourceLine.Message.text() + SpotBugsInfo.BLANK + bug.'@type' - if (priorityNum <= priorityThresholdNum) { // lower is more severe + // lower is more severe + if (priorityNum <= priorityThresholdNum) { bugCountAboveThreshold += 1 log.error(logMsg) } else { From 9c3774427f077714bd0196d222025fee929e756d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 23 Jul 2022 23:32:39 -0400 Subject: [PATCH 3/5] [pom] Update comment on gmavenplus about 1.8 vs 8 as fixed in future release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 051e4a6f..7ff9f2cd 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ 4.7.1 - + 1.8 5.9.0-RC1 From c811a57edb2b31cb040778f0db2b2c6a1cae7bb3 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 24 Jul 2022 00:07:00 -0400 Subject: [PATCH 4/5] [maven] Add java.base/java.io all unnamed add opens so site works with jdk 17 --- .mvn/jvm.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/jvm.config b/.mvn/jvm.config index fbc2b50e..24563d09 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --XX:+TieredCompilation -XX:TieredStopAtLevel=1 +-XX:+TieredCompilation -XX:TieredStopAtLevel=1 --add-opens=java.base/java.io=ALL-UNNAMED From cf3dbf89ceff70656f1b2c1629d718e687952735 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 24 Jul 2022 00:09:09 -0400 Subject: [PATCH 5/5] [github] Move more builds to jdk 17 --- .github/workflows/coveralls.yaml | 2 +- .github/workflows/coverity.yaml | 2 +- .github/workflows/it.yaml | 2 +- .github/workflows/site.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 92c5c5ec..038e5ebe 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -27,7 +27,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'zulu' - name: Report Coverage to Coveralls for Pull Requests if: github.event_name == 'pull_request' diff --git a/.github/workflows/coverity.yaml b/.github/workflows/coverity.yaml index 87f593ee..c7cfd0d8 100644 --- a/.github/workflows/coverity.yaml +++ b/.github/workflows/coverity.yaml @@ -14,7 +14,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'zulu' - name: Analyze with Coverity run: | diff --git a/.github/workflows/it.yaml b/.github/workflows/it.yaml index 62be1a87..6c139117 100644 --- a/.github/workflows/it.yaml +++ b/.github/workflows/it.yaml @@ -30,7 +30,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'zulu' - name: Build Setup run: ./mvnw clean install diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml index 156ee972..0c630ddc 100644 --- a/.github/workflows/site.yaml +++ b/.github/workflows/site.yaml @@ -14,7 +14,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'zulu' - uses: webfactory/ssh-agent@master with: