Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deps update #146

Merged
merged 2 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -17,7 +17,7 @@ subprojects {
}

ext {
springBootVersion = '3.2.3'
springBootVersion = '3.3.2'
resilience4jVersion = '2.2.0'
okHttpVersion = '4.12.0'

Expand Down Expand Up @@ -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 {
Expand All @@ -85,5 +85,5 @@ nexusPublishing {
}

wrapper {
gradleVersion = '8.6'
gradleVersion = '8.9'
}
2 changes: 1 addition & 1 deletion charon-spring-webflux/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
}

jacoco {
toolVersion = '0.8.11'
toolVersion = '0.8.12'
}

jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion charon-spring-webmvc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
}

jacoco {
toolVersion = '0.8.11'
toolVersion = '0.8.12'
}

jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion charon-test/build.gradle
Original file line number Diff line number Diff line change
@@ -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
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -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/.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##########################################################################
Expand Down
4 changes: 2 additions & 2 deletions release
Original file line number Diff line number Diff line change
Expand Up @@ -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
./gradlew clean test release -Prelease.forceVersion=$VERSION && ./gradlew publishToSonatype -PsignArtifacts closeAndReleaseStagingRepositories
fi