diff --git a/.github/workflows/0.initial.migrate-repo-template.yml b/.github/workflows/0.initial.migrate-repo-template.yml index 2cd3c6a..33a835e 100644 --- a/.github/workflows/0.initial.migrate-repo-template.yml +++ b/.github/workflows/0.initial.migrate-repo-template.yml @@ -60,7 +60,7 @@ jobs: fi - name: Checkout project sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: main token: ${{ secrets.CI_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/callable.build.yml b/.github/workflows/callable.build.yml index 9d36958..12e9428 100644 --- a/.github/workflows/callable.build.yml +++ b/.github/workflows/callable.build.yml @@ -9,22 +9,21 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout project sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: 'corretto' java-version: '21' - - uses: gradle/actions/wrapper-validation@v3 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.5.0 + uses: gradle/actions/setup-gradle@v4.4.3 with: cache-write-only: true - name: Run build (incl. test) run: ./gradlew build -x intTest --no-daemon - name: Publish Test Report - uses: mikepenz/action-junit-report@v4 + uses: mikepenz/action-junit-report@v5 if: success() || failure() # always run even if the previous step fails with: report_paths: '**/build/test-results/test/TEST-*.xml' diff --git a/.github/workflows/callable.code-analysis.codeql.yml b/.github/workflows/callable.code-analysis.codeql.yml index 565e90a..522ee6e 100644 --- a/.github/workflows/callable.code-analysis.codeql.yml +++ b/.github/workflows/callable.code-analysis.codeql.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL @@ -35,13 +35,12 @@ jobs: # queries: security-extended,security-and-quality queries: security-extended,security-and-quality - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: 'corretto' java-version: '21' - - uses: gradle/actions/wrapper-validation@v3 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.5.0 + uses: gradle/actions/setup-gradle@v4.4.3 with: cache-read-only: true - name: Run build with Gradle Wrapper diff --git a/.github/workflows/callable.code-analysis.trivy.yml b/.github/workflows/callable.code-analysis.trivy.yml index 624889b..0662f7e 100644 --- a/.github/workflows/callable.code-analysis.trivy.yml +++ b/.github/workflows/callable.code-analysis.trivy.yml @@ -15,15 +15,14 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: 'corretto' java-version: '21' - - uses: gradle/actions/wrapper-validation@v3 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.5.0 + uses: gradle/actions/setup-gradle@v4.4.3 with: cache-read-only: true diff --git a/.github/workflows/callable.gradle-release.yml b/.github/workflows/callable.gradle-release.yml index e85ccb6..6424bee 100644 --- a/.github/workflows/callable.gradle-release.yml +++ b/.github/workflows/callable.gradle-release.yml @@ -23,17 +23,16 @@ jobs: exit 1 fi - name: Checkout project sources ('main' branch) - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: main token: ${{ secrets.CI_GITHUB_TOKEN }} - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: 'corretto' java-version: '21' - - uses: gradle/actions/wrapper-validation@v3 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.5.0 + uses: gradle/actions/setup-gradle@v4.4.3 with: cache-read-only: true diff --git a/.github/workflows/callable.integration-test.yml b/.github/workflows/callable.integration-test.yml index e4d839a..71972dc 100644 --- a/.github/workflows/callable.integration-test.yml +++ b/.github/workflows/callable.integration-test.yml @@ -9,15 +9,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout project sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: 'corretto' java-version: '21' - - uses: gradle/actions/wrapper-validation@v3 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.5.0 + uses: gradle/actions/setup-gradle@v4.4.3 with: cache-read-only: true @@ -25,7 +24,7 @@ jobs: run: ./gradlew intTest -x test --no-daemon - name: Publish Test Report - uses: mikepenz/action-junit-report@v4 + uses: mikepenz/action-junit-report@v5 if: success() || failure() # always run even if the previous step fails with: report_paths: '**/build/test-results/intTest/TEST-*.xml' diff --git a/.github/workflows/callable.publish-javadoc.yml b/.github/workflows/callable.publish-javadoc.yml index abacc6d..4c69b95 100644 --- a/.github/workflows/callable.publish-javadoc.yml +++ b/.github/workflows/callable.publish-javadoc.yml @@ -12,15 +12,14 @@ jobs: contents: write steps: - name: Checkout project sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: 'corretto' java-version: '21' - - uses: gradle/actions/wrapper-validation@v3 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.5.0 + uses: gradle/actions/setup-gradle@v4.4.3 with: cache-read-only: true @@ -59,7 +58,7 @@ jobs: contents: write steps: - name: Checkout project sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: main token: ${{ secrets.CI_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} @@ -84,7 +83,7 @@ jobs: echo "JavaScript is disabled on your browser./$GITHUB_REPOSITORY_NAME/javadoc/" > index.html - name: Download artifact from build job - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: javadoc.zip diff --git a/.github/workflows/callable.publish-sonatype.yml b/.github/workflows/callable.publish-sonatype.yml index 61d5bff..9595c89 100644 --- a/.github/workflows/callable.publish-sonatype.yml +++ b/.github/workflows/callable.publish-sonatype.yml @@ -8,15 +8,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout project sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: 'corretto' java-version: '21' - - uses: gradle/actions/wrapper-validation@v3 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.5.0 + uses: gradle/actions/setup-gradle@v4.4.3 with: cache-read-only: true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 25bdaa1..fe9a56b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,14 @@ [versions] -junit = "5.10.3" -assertj = "3.26.3" -testcontainers = "1.20.0" +junit = "5.13.4" +assertj = "3.27.5" +testcontainers = "1.21.3" publish_plugin = "2.0.0" -release_plugin = "3.0.2" +release_plugin = "3.1.0" [libraries] -junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" } +junit_bom = { module = "org.junit:junit-bom", version.ref = "junit" } +junit_jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" } +junit_platform = { module = "org.junit.platform:junit-platform-launcher" } assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" } testcontainers_junit5 = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c35211..8bdaf60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..2e11132 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..adff685 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -173,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -206,15 +203,14 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a21..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/java-library-template/build.gradle.kts b/java-library-template/build.gradle.kts index 9f96f54..df051c1 100644 --- a/java-library-template/build.gradle.kts +++ b/java-library-template/build.gradle.kts @@ -39,14 +39,22 @@ val intTestImplementation by configurations.getting { extendsFrom(configurations.implementation.get()) } +val intTestRuntimeOnly by configurations.getting { + extendsFrom(configurations.runtimeOnly.get()) +} + configurations["intTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.get()) dependencies { - testImplementation(libs.junit) + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter) + testRuntimeOnly(libs.junit.platform) - intTestImplementation(libs.junit) + intTestImplementation(platform(libs.junit.bom)) + intTestImplementation(libs.junit.jupiter) intTestImplementation(libs.bundles.testcontainers.junit) intTestImplementation(libs.assertj) + intTestRuntimeOnly(libs.junit.platform) } val intTest = task("intTest") { @@ -60,7 +68,7 @@ val intTest = task("intTest") { useJUnitPlatform() testLogging { - events("passed") + events("passed", "skipped", "failed") } }
JavaScript is disabled on your browser.
/$GITHUB_REPOSITORY_NAME/javadoc/