Skip to content

Commit f7cbce2

Browse files
authored
Merge branch 'main' into fix-mysql-9.3
2 parents 0a8c42e + 0cfe1f7 commit f7cbce2

File tree

180 files changed

+1270
-908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+1270
-908
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@ updates:
1616
update-types: [ "version-update:semver-major" ]
1717
- dependency-name: "org.mockito:mockito-core"
1818
update-types: [ "version-update:semver-major" ]
19-
- dependency-name: "org.yaml:snakeyaml"
20-
update-types: [ "version-update:semver-major" ]
2119
- dependency-name: "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
2220
update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
23-
- dependency-name: "org.apache.commons:commons-compress"
24-
update-types: [ "version-update:semver-minor" ]
2521
- package-ecosystem: "gradle"
2622
directory: "/"
2723
allow:

.github/workflows/combine-prs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
steps:
1414
- name: combine-prs
1515
id: combine-prs
16-
uses: github/combine-prs@v5.1.0
16+
uses: github/combine-prs@v5.2.0
1717
with:
1818
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/moby-latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Notify to Slack on failures
4444
if: failure()
4545
id: slack
46-
uses: slackapi/slack-github-action@v1.27.0
46+
uses: slackapi/slack-github-action@v2.1.1
4747
with:
4848
payload: |
4949
{

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
if: github.repository == 'testcontainers/testcontainers-java'
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: release-drafter/release-drafter@3f0f87098bd6b5c5b9a36d49c41d998ea58f9348 # v5.19.0
21+
- uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v5.19.0
2222
env:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ jobs:
3030
run: |
3131
./gradlew publish \
3232
-Pversion="${{github.event.release.tag_name}}" --scan --no-daemon -i
33+
34+
- name: Run Gradle Deploy
35+
run: |
36+
./gradlew jreleaserDeploy -Pversion="${{github.event.release.tag_name}}" --scan --no-daemon -i
3337
env:
34-
OSSRH_USERNAME: ${{secrets.OSSRH_USERNAME}}
35-
OSSRH_PASSWORD: ${{secrets.OSSRH_PASSWORD}}
38+
JRELEASER_GPG_PUBLIC_KEY: ${{ vars.GPG_PUBLIC_KEY }}
39+
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SIGNING_KEY }}
40+
JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
41+
JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_USERNAME }}
42+
JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_PASSWORD }}

.github/workflows/update-docs-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
2424
git diff
2525
- name: Create Pull Request
26-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v3.10.1
26+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v3.10.1
2727
with:
2828
title: Update docs version to ${GITHUB_REF##*/}
2929
body: |

.github/workflows/update-gradle-wrapper.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
- uses: actions/checkout@v4
2020

2121
- name: Update Gradle Wrapper
22-
uses: gradle-update/update-gradle-wrapper-action@9268373d69bd0974b6318eb3b512b8e025060bbe # v1.0.13
22+
uses: gradle-update/update-gradle-wrapper-action@512b1875f3b6270828abfe77b247d5895a2da1e5 # v1.0.13
2323
with:
2424
repo-token: ${{ secrets.GITHUB_TOKEN }}
2525
labels: dependencies
2626

27-
- uses: gradle/actions/wrapper-validation@v3
27+
- uses: gradle/actions/wrapper-validation@v4

.github/workflows/update-testcontainers-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF##*/}/g" gradle.properties
2424
git diff
2525
- name: Create Pull Request
26-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v3.10.1
26+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v3.10.1
2727
with:
2828
title: Update testcontainers version to ${GITHUB_REF##*/}
2929
body: |

build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ buildscript {
1212

1313
plugins {
1414
id 'io.franzbecker.gradle-lombok' version '5.0.0'
15-
id 'com.gradleup.shadow' version '8.3.0'
15+
id 'com.gradleup.shadow' version '8.3.8'
1616
id 'me.champeau.gradle.japicmp' version '0.4.3' apply false
1717
id 'com.diffplug.spotless' version '6.22.0' apply false
18+
id 'org.jreleaser' version '1.18.0' apply false
1819
}
1920

2021
apply from: "$rootDir/gradle/ci-support.gradle"
@@ -131,11 +132,11 @@ subprojects {
131132
}
132133

133134
dependencies {
134-
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
135+
testImplementation 'ch.qos.logback:logback-classic:1.3.15'
135136
}
136137

137138
checkstyle {
138-
toolVersion = "10.12.4"
139+
toolVersion = "10.23.0"
139140
configFile = rootProject.file('config/checkstyle/checkstyle.xml')
140141
}
141142
}

core/build.gradle

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,34 +62,33 @@ tasks.japicmp {
6262

6363
configurations.all {
6464
resolutionStrategy {
65-
// use lower Jackson version
66-
force 'com.fasterxml.jackson.core:jackson-databind:2.8.8'
67-
force 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.8'
65+
force 'com.fasterxml.jackson.core:jackson-databind:2.18.4'
66+
force 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.4'
6867
}
6968
}
7069

7170
dependencies {
7271
api 'junit:junit:4.13.2'
7372
api 'org.slf4j:slf4j-api:1.7.36'
74-
compileOnly 'org.jetbrains:annotations:24.1.0'
75-
testCompileOnly 'org.jetbrains:annotations:24.1.0'
73+
compileOnly 'org.jetbrains:annotations:26.0.2'
74+
testCompileOnly 'org.jetbrains:annotations:26.0.2'
7675
api 'org.apache.commons:commons-compress:1.24.0'
7776
api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
7877
exclude(group: 'org.jetbrains', module: 'annotations')
7978
}
8079

81-
provided('com.google.cloud.tools:jib-core:0.23.0') {
80+
provided('com.google.cloud.tools:jib-core:0.27.3') {
8281
exclude group: 'com.google.guava', module: 'guava'
8382
exclude group: 'com.fasterxml.jackson.datatype', module: 'jackson-datatype-jsr310'
8483
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
8584
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
8685
exclude group: 'org.apache.commons', module: 'commons-compress'
8786
}
8887

89-
shaded 'org.awaitility:awaitility:4.2.0'
88+
shaded 'org.awaitility:awaitility:4.3.0'
9089

91-
api platform('com.github.docker-java:docker-java-bom:3.4.2')
92-
shaded platform('com.github.docker-java:docker-java-bom:3.4.2')
90+
api platform('com.github.docker-java:docker-java-bom:3.5.3')
91+
shaded platform('com.github.docker-java:docker-java-bom:3.5.3')
9392

9493
api "com.github.docker-java:docker-java-api"
9594

@@ -100,18 +99,18 @@ dependencies {
10099
api 'com.github.docker-java:docker-java-transport-zerodep'
101100

102101
shaded 'com.google.guava:guava:33.3.1-jre'
103-
shaded "org.yaml:snakeyaml:1.33"
102+
shaded "org.yaml:snakeyaml:2.4"
104103

105104
shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
106105

107106
shaded 'org.zeroturnaround:zt-exec:1.12'
108107

109-
testImplementation('com.google.cloud.tools:jib-core:0.23.0') {
108+
testImplementation('com.google.cloud.tools:jib-core:0.27.3') {
110109
exclude group: 'com.google.guava', module: 'guava'
111110
}
112111
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
113-
testImplementation 'redis.clients:jedis:5.1.5'
114-
testImplementation 'com.rabbitmq:amqp-client:5.22.0'
112+
testImplementation 'redis.clients:jedis:6.0.0'
113+
testImplementation 'com.rabbitmq:amqp-client:5.25.0'
115114
testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
116115

117116
testImplementation ('org.mockito:mockito-core:4.11.0') {
@@ -120,13 +119,13 @@ dependencies {
120119
// Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
121120
testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
122121

123-
testImplementation 'org.assertj:assertj-core:3.26.3'
124-
testImplementation 'io.rest-assured:rest-assured:5.5.0'
122+
testImplementation 'org.assertj:assertj-core:3.27.3'
123+
testImplementation 'io.rest-assured:rest-assured:5.5.5'
125124

126125
jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
127126
jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
128127
jarFileTestImplementation 'junit:junit:4.13.2'
129-
jarFileTestImplementation 'org.assertj:assertj-core:3.26.3'
128+
jarFileTestImplementation 'org.assertj:assertj-core:3.27.3'
130129
jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
131130
}
132131

0 commit comments

Comments
 (0)