Merge pull request #21 from project-tsurugi/fix-ci-warnings

Fix build warnings for incompatible with Gradle 9.0
project-tsurugi · Feb 7, 2024 · 7876252 · 7876252
2 parents 1a5f1f7 + 973d5e3
commit 7876252
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -23,21 +23,21 @@ 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: |
-          ./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

diff --git a/java/cost-accounting-benchmark/build.gradle b/java/cost-accounting-benchmark/build.gradle
@@ -1,8 +1,7 @@
 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.github.spotbugs' version '5.2.5'
 }
 
 group = 'com.tsurugidb.benchmark.cost-accounting-benchmark'
@@ -47,15 +46,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")
+        }
     }
 }
 
@@ -81,7 +79,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 +114,7 @@ task showIceaxeManifest {
     }
 }
 
-startScripts {
+application {
     applicationName = 'costaccounting'
     mainClass = 'com.tsurugidb.benchmark.costaccounting.Main'
     applicationDefaultJvmArgs = ['-Dcom.tsurugidb.tsubakuro.jniverify=false']

diff --git a/java/cost-accounting-benchmark/spotbugs-exclude-filter.xml b/java/cost-accounting-benchmark/spotbugs-exclude-filter.xml
@@ -23,4 +23,13 @@
   <Match>
     <Package name="com.tsurugidb.benchmark.costaccounting.example" />
   </Match>
+  <Match>
+    <Or>
+      <Bug pattern="CT_CONSTRUCTOR_THROW" />
+      <Bug pattern="EI_EXPOSE_REP" />
+      <Bug pattern="EI_EXPOSE_REP2" />
+      <Bug pattern="MS_EXPOSE_REP" />
+      <Bug pattern="EI_EXPOSE_STATIC_REP2" />
+    </Or>
+  </Match>
 </FindBugsFilter>