Skip to content

Commit 0ebff0b

Browse files
committed
Merge branch 'master' into remove-slf4j
# Conflicts: # build.gradle
2 parents 144facd + eb6b7c1 commit 0ebff0b

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }}
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
- uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 11
2121
uses: actions/setup-java@v4

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
buildAndTest:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- uses: gradle/actions/wrapper-validation@v4
1616
- name: Set up JDK 11
1717
uses: actions/setup-java@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
RELEASE_VERSION: ${{ github.event.inputs.version }}
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- uses: gradle/actions/wrapper-validation@v4
2424
- name: Set up JDK 11
2525
uses: actions/setup-java@v4

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ dependencies {
4545
api "org.hibernate.validator:hibernate-validator:7.0.1.Final"
4646
api "org.glassfish:jakarta.el:4.0.2"
4747

48-
testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5'
49-
testImplementation 'org.codehaus.groovy:groovy-all:2.5.14'
48+
testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
49+
testImplementation 'org.codehaus.groovy:groovy-all:3.0.25'
5050
}
5151

5252
task sourcesJar(type: Jar, dependsOn: classes) {

0 commit comments

Comments
 (0)