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

Fix build warnings for incompatible with Gradle 9.0
project-tsurugi · Jan 31, 2024 · 1b8b282 · 1b8b282
2 parents 93c2947 + 23ea7b2
commit 1b8b282
Show file tree

Hide file tree

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

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    implementation 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.1'
+    implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.7'
 }
diff --git a/modules/kvs/build.gradle b/modules/kvs/build.gradle
@@ -26,6 +26,8 @@ sourceSets {
     }
 }
 
+spotbugsKvsIntegrationTest.enabled = false
+
 configurations {
     kvsIntegrationTestImplementation.extendsFrom testImplementation
     kvsIntegrationTestRuntime.extendsFrom testRuntime

diff --git a/modules/tpcc/build.gradle b/modules/tpcc/build.gradle
@@ -15,11 +15,10 @@ tasks.register('runTpcc', JavaExec) {
     systemProperty 'org.slf4j.simpleLogger.levelInBrackets', 'true'
 }
 
-startScripts {
+application {
     applicationName = 'tpcc'
     mainClass = 'com.tsurugidb.tsubakuro.examples.tpcc.Main'
     applicationDefaultJvmArgs = [
-        '-Dcom.tsurugidb.tsubakuro.jniverify=false',
         '-Dtsurugi.dbname=ipc:tsurugi'
     ]
 }

diff --git a/modules/tpccLoader/build.gradle b/modules/tpccLoader/build.gradle
@@ -23,11 +23,10 @@ tasks.register('runTpccLoader', JavaExec) {
     systemProperty 'org.slf4j.simpleLogger.levelInBrackets', 'true'
 }
 
-startScripts {
+application {
     applicationName = 'tpccLoader'
     mainClass = 'com.tsurugidb.tsubakuro.examples.tpccLoader.Main'
     applicationDefaultJvmArgs = [
-        '-Dcom.tsurugidb.tsubakuro.jniverify=false',
         '-Dtsurugi.dbname=ipc:tsurugi'
     ]
 }