diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c934cc0..a02dc53 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: with: fetch-depth: 0 ref: ${{ github.head_ref }} - - uses: gradle/wrapper-validation-action@v2 + - uses: gradle/actions/wrapper-validation@v3 - uses: actions/setup-java@v4 with: distribution: temurin diff --git a/build.gradle b/build.gradle index 615d034..0a663ed 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'pl.allegro.tech.build.axion-release' version '1.17.0' - id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' + id 'pl.allegro.tech.build.axion-release' version '1.18.2' + id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' } subprojects { @@ -17,7 +17,7 @@ subprojects { } ext { - springBootVersion = '3.2.3' + springBootVersion = '3.3.2' resilience4jVersion = '2.2.0' okHttpVersion = '4.12.0' @@ -58,15 +58,15 @@ subprojects { version = scmVersion.version dependencies { - api group: 'org.springframework', name: 'spring-web', version: '6.1.4' + api group: 'org.springframework', name: 'spring-web', version: '6.1.11' api group: 'io.github.resilience4j', name: 'resilience4j-circuitbreaker', version: resilience4jVersion api group: 'io.github.resilience4j', name: 'resilience4j-ratelimiter', version: resilience4jVersion api group: 'io.github.resilience4j', name: 'resilience4j-retry', version: resilience4jVersion api group: 'io.github.resilience4j', name: 'resilience4j-micrometer', version: resilience4jVersion api group: 'io.micrometer', name: 'micrometer-core', version: '1.12.3' - api group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0' + api group: 'org.apache.commons', name: 'commons-lang3', version: '3.15.0' api group: 'org.apache.commons', name: 'commons-collections4', version: '4.4' - api group: 'commons-io', name: 'commons-io', version: '2.15.1' + api group: 'commons-io', name: 'commons-io', version: '2.16.1' } test { @@ -85,5 +85,5 @@ nexusPublishing { } wrapper { - gradleVersion = '8.6' + gradleVersion = '8.9' } diff --git a/charon-spring-webflux/build.gradle b/charon-spring-webflux/build.gradle index fefb680..2beea74 100644 --- a/charon-spring-webflux/build.gradle +++ b/charon-spring-webflux/build.gradle @@ -10,7 +10,7 @@ dependencies { } jacoco { - toolVersion = '0.8.11' + toolVersion = '0.8.12' } jacocoTestReport { diff --git a/charon-spring-webmvc/build.gradle b/charon-spring-webmvc/build.gradle index 43c1272..c879cfa 100644 --- a/charon-spring-webmvc/build.gradle +++ b/charon-spring-webmvc/build.gradle @@ -9,7 +9,7 @@ dependencies { } jacoco { - toolVersion = '0.8.11' + toolVersion = '0.8.12' } jacocoTestReport { diff --git a/charon-test/build.gradle b/charon-test/build.gradle index 19bc31f..04d25e4 100644 --- a/charon-test/build.gradle +++ b/charon-test/build.gradle @@ -1,7 +1,7 @@ dependencies { api project(':charon-common') api group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion - api group: 'org.spockframework', name: 'spock-spring', version: '2.4-M2-groovy-4.0' + api group: 'org.spockframework', name: 'spock-spring', version: '2.4-M4-groovy-4.0' api group: 'org.mock-server', name: 'mockserver-netty', version: '5.15.0' api group: 'com.squareup.okhttp3', name: 'okhttp', version: okHttpVersion } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..2c35211 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 a80b22c..09523c0 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.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f5feea6 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 7101f8e..9b42019 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/release b/release index e1f410b..fd7f2eb 100755 --- a/release +++ b/release @@ -8,5 +8,5 @@ if [ -z "$VERSION" ]; then echo "Set release version using -v option" exit 1 else - ./gradlew clean test release -Prelease.forceVersion=$VERSION && ./gradlew publishToSonatype -PsignArtifacts closeAndReleaseStagingRepository -fi \ No newline at end of file + ./gradlew clean test release -Prelease.forceVersion=$VERSION && ./gradlew publishToSonatype -PsignArtifacts closeAndReleaseStagingRepositories +fi