diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index b920be5921..bc64fbf3eb 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -77,7 +77,7 @@ jobs: storageType: gcs resultsGlob: "**/build/allure-results" bucket: internal-kestra-host - baseUrl: "https://internal.kestra.io" + baseUrl: "https://internal.dev.kestra.io" prefix: ${{ format('{0}/{1}', github.repository, 'allure/java') }} copyLatest: true ignoreMissingResults: true diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index ad9352b46c..7940580c43 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -158,7 +158,7 @@ jobs: storageType: gcs resultsGlob: build/allure-results bucket: internal-kestra-host - baseUrl: "https://internal.kestra.io" + baseUrl: "https://internal.dev.kestra.io" prefix: ${{ format('{0}/{1}/{2}', github.repository, env.GITHUB_HEAD_REF_SLUG != '' && env.GITHUB_HEAD_REF_SLUG || github.ref_name, 'allure/playwright') }} copyLatest: true ignoreMissingResults: true diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 89c38662f8..c403f74848 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -296,7 +296,7 @@ jobs: storageType: gcs resultsGlob: "**/build/allure-results" bucket: internal-kestra-host - baseUrl: "https://internal.kestra.io" + baseUrl: "https://internal.dev.kestra.io" prefix: ${{ format('{0}/{1}', github.repository, 'allure/java') }} copyLatest: true ignoreMissingResults: true diff --git a/build.gradle b/build.gradle index 97052868db..b3705ce906 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ plugins { // release id "io.github.gradle-nexus.publish-plugin" version "2.0.0" - id 'net.researchgate.release' version '3.0.2' + id 'net.researchgate.release' version '3.1.0' id "com.gorylenko.gradle-git-properties" version "2.4.2" id 'signing' id 'ru.vyarus.pom' version '3.0.0' apply false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3..a4b76b9530 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 0aaefbcaf0..cea7a793a8 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.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4269..f5feea6d6b 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30dbde..9d21a21834 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/platform/build.gradle b/platform/build.gradle index c2280a2a74..4f4227eca5 100644 --- a/platform/build.gradle +++ b/platform/build.gradle @@ -130,7 +130,7 @@ dependencies { api 'org.hamcrest:hamcrest:3.0' api 'org.hamcrest:hamcrest-library:3.0' api group: 'org.exparity', name: 'hamcrest-date', version: '2.0.8' - api 'com.github.tomakehurst:wiremock-jre8:3.0.1' + api "org.wiremock:wiremock:3.10.0" api "org.apache.kafka:kafka-streams-test-utils:$kafkaVersion" api "com.microsoft.playwright:playwright:1.49.0" diff --git a/webserver/build.gradle b/webserver/build.gradle index 6e1b0b9dad..219776a6db 100644 --- a/webserver/build.gradle +++ b/webserver/build.gradle @@ -28,7 +28,7 @@ dependencies { testAnnotationProcessor project(':processor') testImplementation project(':core').sourceSets.test.output testImplementation project(':storage-local') - testImplementation("com.github.tomakehurst:wiremock-jre8") + testImplementation "org.wiremock:wiremock" testImplementation project(':tests') testImplementation project(':jdbc')