diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 943b66b..1e7cd2a 100755 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -16,21 +16,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 tgsql:core:showTsubakuroManifest clean assemble + ./gradlew -i tgsql:core:showTsubakuroManifest 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/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 2c83138..4eaed28 100755 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -17,19 +17,19 @@ 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: Create_Release if: contains(github.ref, '/tags/') run: | cd modules/tgsql - ../../gradlew -i distZip + ../../gradlew -i distZip --warning-mode all cd - set -x diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index ae8106b..0645278 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:5.2.5' } diff --git a/buildSrc/src/main/groovy/tanzawa.java-conventions.gradle b/buildSrc/src/main/groovy/tanzawa.java-conventions.gradle index 8aa5772..47d4b86 100644 --- a/buildSrc/src/main/groovy/tanzawa.java-conventions.gradle +++ b/buildSrc/src/main/groovy/tanzawa.java-conventions.gradle @@ -34,8 +34,9 @@ java { } dependencies { - testImplementation(platform('org.junit:junit-bom:5.9.0')) - testImplementation('org.junit.jupiter:junit-jupiter') + testImplementation platform('org.junit:junit-bom:5.10.1') + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } checkstyle { @@ -53,7 +54,12 @@ spotbugsMain { enabled = true destination = file("$buildDir/reports/spotbugs/main/spotbugs.xml") } + html { + enabled = true + destination = file("$buildDir/reports/spotbugs/main/spotbugs.html") + } } + excludeFilter = rootProject.file('buildSrc/src/main/resources/spotbugsExclude.xml') } spotbugsTest.enabled = false @@ -95,7 +101,7 @@ task showTsubakuroManifest { task writeVersion(type: WriteProperties) { description 'generate version file to META-INF/tsurugidb/{project.name}.properties' inputs.property('Build-Revision', buildRevision) - outputFile "${project.buildDir}/generated/version/META-INF/tsurugidb/${project.qualifiedProjectName}.properties" + destinationFile = file("${project.buildDir}/generated/version/META-INF/tsurugidb/${project.qualifiedProjectName}.properties") properties ( 'Build-Timestamp': buildTimestamp, 'Build-Revision' : buildRevision, diff --git a/buildSrc/src/main/resources/spotbugsExclude.xml b/buildSrc/src/main/resources/spotbugsExclude.xml new file mode 100644 index 0000000..2f801f3 --- /dev/null +++ b/buildSrc/src/main/resources/spotbugsExclude.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + diff --git a/modules/tgdump/cli/build.gradle b/modules/tgdump/cli/build.gradle index 57ee5dc..f1ce77f 100644 --- a/modules/tgdump/cli/build.gradle +++ b/modules/tgdump/cli/build.gradle @@ -1,7 +1,7 @@ plugins { id 'tanzawa.java-conventions' id 'application' - id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'com.github.johnrengelman.shadow' version '8.1.1' } dependencies { diff --git a/modules/tgsql/cli/build.gradle b/modules/tgsql/cli/build.gradle index 6145440..28bbb85 100644 --- a/modules/tgsql/cli/build.gradle +++ b/modules/tgsql/cli/build.gradle @@ -1,7 +1,7 @@ plugins { id 'tanzawa.java-conventions' id 'application' - id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'com.github.johnrengelman.shadow' version '8.1.1' } dependencies {