From d74bcb032c7a3daaa68901a129b14c41ad8f31ac Mon Sep 17 00:00:00 2001 From: Akira KAWAGUCHI Date: Wed, 7 Feb 2024 11:20:07 +0900 Subject: [PATCH 1/6] ci: bump actions/setup-java, actions/checkout to v4 --- .github/workflows/ci-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 80dd2db..0dd60c6 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -23,13 +23,13 @@ jobs: steps: - name: Setup_Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '11' - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Assemble run: | From 0f4672d9d13208245800df1a10039ba9c7761947 Mon Sep 17 00:00:00 2001 From: Akira KAWAGUCHI Date: Wed, 7 Feb 2024 11:20:48 +0900 Subject: [PATCH 2/6] ci: add --warning-mode all option to gradlew --- .github/workflows/ci-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 0dd60c6..a7f710b 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -33,11 +33,11 @@ jobs: - name: Assemble run: | - ./gradlew -i showTsubakuroManifest showIceaxeManifest clean assemble + ./gradlew -i showTsubakuroManifest showIceaxeManifest clean assemble --warning-mode all - name: Check run: | - ./gradlew -i check --continue + ./gradlew -i check --continue --warning-mode all - name: Verify uses: project-tsurugi/tsurugi-annotations-action@v1 From 19d932df08254bb9bd383020747e1337e96046e7 Mon Sep 17 00:00:00 2001 From: Akira KAWAGUCHI Date: Wed, 7 Feb 2024 11:26:47 +0900 Subject: [PATCH 3/6] build: fix warnings for incompatible with Gradle 9.0 --- java/cost-accounting-benchmark/build.gradle | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/java/cost-accounting-benchmark/build.gradle b/java/cost-accounting-benchmark/build.gradle index 90e3f7e..cacfa6f 100755 --- a/java/cost-accounting-benchmark/build.gradle +++ b/java/cost-accounting-benchmark/build.gradle @@ -1,8 +1,8 @@ plugins { id 'java-library' id 'application' - id 'com.diffplug.eclipse.apt' version '3.24.0' - id 'com.github.spotbugs' version '4.7.1' + id 'com.diffplug.eclipse.apt' version '3.44.0' + id 'com.github.spotbugs' version '5.2.5' } group = 'com.tsurugidb.benchmark.cost-accounting-benchmark' @@ -81,7 +81,9 @@ dependencies { implementation "ch.qos.logback:logback-classic:1.2.3" - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' + testImplementation platform('org.junit:junit-bom:5.10.1') + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } tasks.named('test') { @@ -114,7 +116,7 @@ task showIceaxeManifest { } } -startScripts { +application { applicationName = 'costaccounting' mainClass = 'com.tsurugidb.benchmark.costaccounting.Main' applicationDefaultJvmArgs = ['-Dcom.tsurugidb.tsubakuro.jniverify=false'] From 5e13f1337fed0a6133f384c100bff95ee5708208 Mon Sep 17 00:00:00 2001 From: Akira KAWAGUCHI Date: Wed, 7 Feb 2024 11:29:51 +0900 Subject: [PATCH 4/6] ci: modify spotbugsMain task configuration for commonized with other projects --- java/cost-accounting-benchmark/build.gradle | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/java/cost-accounting-benchmark/build.gradle b/java/cost-accounting-benchmark/build.gradle index cacfa6f..1cdbdd3 100755 --- a/java/cost-accounting-benchmark/build.gradle +++ b/java/cost-accounting-benchmark/build.gradle @@ -47,15 +47,14 @@ spotbugs { spotbugsMain { reports { - html { - enabled = !project.hasProperty("ci") - destination = file("$buildDir/reports/spotbugs/main/spotbugs.html") - stylesheet = 'fancy-hist.xsl' - } xml { - enabled = project.hasProperty("ci") + enabled = true destination = file("$buildDir/reports/spotbugs/main/spotbugs.xml") } + html { + enabled = true + destination = file("$buildDir/reports/spotbugs/main/spotbugs.html") + } } } From 3e61e151964e6c6c6d867857f03ddf91f8d59943 Mon Sep 17 00:00:00 2001 From: Akira KAWAGUCHI Date: Wed, 7 Feb 2024 11:38:59 +0900 Subject: [PATCH 5/6] build: suppress spotbugs warnings detected by upgrading spotbugs --- .../spotbugs-exclude-filter.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/java/cost-accounting-benchmark/spotbugs-exclude-filter.xml b/java/cost-accounting-benchmark/spotbugs-exclude-filter.xml index b8883bd..2769347 100755 --- a/java/cost-accounting-benchmark/spotbugs-exclude-filter.xml +++ b/java/cost-accounting-benchmark/spotbugs-exclude-filter.xml @@ -23,4 +23,13 @@ + + + + + + + + + From 973d5e3944dbcc0d55a2591368c8999a499bf54b Mon Sep 17 00:00:00 2001 From: Akira KAWAGUCHI Date: Wed, 7 Feb 2024 12:50:31 +0900 Subject: [PATCH 6/6] build: remove unused gradle plugin --- java/cost-accounting-benchmark/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/java/cost-accounting-benchmark/build.gradle b/java/cost-accounting-benchmark/build.gradle index 1cdbdd3..2bab9f4 100755 --- a/java/cost-accounting-benchmark/build.gradle +++ b/java/cost-accounting-benchmark/build.gradle @@ -1,7 +1,6 @@ plugins { id 'java-library' id 'application' - id 'com.diffplug.eclipse.apt' version '3.44.0' id 'com.github.spotbugs' version '5.2.5' }