From 1b8e2631f5d62ca67d113a332cfb599464c2a904 Mon Sep 17 00:00:00 2001 From: Akira KAWAGUCHI Date: Wed, 31 Jan 2024 12:56:28 +0900 Subject: [PATCH 1/2] 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 e41f77a..8c38288 100755 --- 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: | From 23ea7b223c87a2a7fb39a436377b776b00a0b096 Mon Sep 17 00:00:00 2001 From: Akira KAWAGUCHI Date: Wed, 31 Jan 2024 13:12:03 +0900 Subject: [PATCH 2/2] build: fix warnings for incompatible with Gradle 9.0 --- buildSrc/build.gradle | 2 +- modules/kvs/build.gradle | 2 ++ modules/tpcc/build.gradle | 3 +-- modules/tpccLoader/build.gradle | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index ae8106b..940dc6b 100644 --- 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 index 524026b..e833f2d 100644 --- 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 index 7450cb6..7832c46 100644 --- 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 index 15bb0a0..4bd5f61 100644 --- 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' ] }