Skip to content

Commit a2e7ecc

Browse files
authored
Merge branch 'main' into RyukResourceReaper-debug
2 parents 56a9743 + 10cc854 commit a2e7ecc

File tree

580 files changed

+11431
-6678
lines changed

Some content is hidden

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

580 files changed

+11431
-6678
lines changed

.github/dependabot.yml

Lines changed: 11 additions & 9 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:
@@ -31,6 +27,9 @@ updates:
3127
schedule:
3228
interval: "weekly"
3329
open-pull-requests-limit: 10
30+
ignore:
31+
- dependency-name: "com.gradleup.shadow"
32+
update-types: [ "version-update:semver-major" ]
3433

3534
# Explicit entry for each module
3635
- package-ecosystem: "gradle"
@@ -165,9 +164,6 @@ updates:
165164
schedule:
166165
interval: "monthly"
167166
open-pull-requests-limit: 10
168-
ignore:
169-
- dependency-name: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
170-
update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
171167
- package-ecosystem: "gradle"
172168
directory: "/modules/kafka"
173169
schedule:
@@ -279,11 +275,17 @@ updates:
279275
schedule:
280276
interval: "monthly"
281277
open-pull-requests-limit: 10
278+
ignore:
279+
- dependency-name: "io.pinecone:pinecone-client"
280+
update-types: [ "version-update:semver-major" ]
282281
- package-ecosystem: "gradle"
283282
directory: "/modules/pulsar"
284283
schedule:
285284
interval: "monthly"
286285
open-pull-requests-limit: 10
286+
ignore:
287+
- dependency-name: "org.apache.pulsar:pulsar-bom"
288+
update-types: [ "version-update:semver-patch" ]
287289
- package-ecosystem: "gradle"
288290
directory: "/modules/qdrant"
289291
schedule:
@@ -407,7 +409,7 @@ updates:
407409
- dependency-name: "org.springframework.boot"
408410
update-types: [ "version-update:semver-major" ]
409411
- dependency-name: "com.diffplug.spotless"
410-
update-types: [ "version-update:semver-minor" ]
412+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
411413
- dependency-name: "com.hazelcast:hazelcast"
412414
update-types: [ "version-update:semver-minor" ]
413415

@@ -421,7 +423,7 @@ updates:
421423
- dependency-name: "ch.qos.logback:logback-classic"
422424
update-types: [ "version-update:semver-minor" ]
423425
- dependency-name: "com.diffplug.spotless"
424-
update-types: [ "version-update:semver-minor" ]
426+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
425427

426428
# GitHub Actions
427429
- package-ecosystem: "github-actions"

.github/workflows/ci-docker-wormhole.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
in-docker_test:
4545
runs-on: ubuntu-22.04
4646
steps:
47-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@v5
4848
- name: Build with Gradle
4949
run: |
5050
docker run -i --rm \

.github/workflows/ci-rootless.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ jobs:
4646
permissions:
4747
checks: write
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
5050
- name: Setup rootless Docker
5151
uses: docker/setup-docker-action@v4
5252
with:
5353
rootless: true
5454
- name: Setup Gradle Build Action
55-
uses: gradle/actions/setup-gradle@v4
55+
uses: gradle/actions/setup-gradle@v5
5656
- name: Build with Gradle
5757
run: ./gradlew --no-daemon --scan testcontainers:test --tests '*GenericContainerRuleTest'
5858
- uses: ./.github/actions/setup-junit-report

.github/workflows/ci-windows.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
permissions:
5353
checks: write
5454
steps:
55-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v5
5656
- uses: ./.github/actions/setup-build
5757
- name: Build with Gradle
5858
run: ./gradlew.bat cleanTest testcontainers:test --no-daemon --continue --scan --no-build-cache
@@ -66,7 +66,7 @@ jobs:
6666
statuses: write
6767
steps:
6868
- name: Create pending status
69-
uses: actions/github-script@v7
69+
uses: actions/github-script@v8
7070
with:
7171
github-token: ${{ secrets.GITHUB_TOKEN }}
7272
script: |
@@ -78,7 +78,7 @@ jobs:
7878
target_url: `https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`,
7979
context: 'CI - Windows',
8080
})
81-
- uses: actions/checkout@v4
81+
- uses: actions/checkout@v5
8282
with:
8383
token: ${{ secrets.GITHUB_TOKEN }}
8484
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
@@ -89,7 +89,7 @@ jobs:
8989
- uses: ./.github/actions/setup-junit-report
9090

9191
- name: Create success status
92-
uses: actions/github-script@v7
92+
uses: actions/github-script@v8
9393
if: success()
9494
with:
9595
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -104,7 +104,7 @@ jobs:
104104
})
105105
106106
- name: Create failure status
107-
uses: actions/github-script@v7
107+
uses: actions/github-script@v8
108108
if: failure()
109109
with:
110110
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
matrix:
5555
java: [ '17', '21' ]
5656
steps:
57-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v5
5858
- uses: ./.github/actions/setup-build
5959
with:
6060
java-version: ${{ matrix.java }}
@@ -69,7 +69,7 @@ jobs:
6969
permissions:
7070
checks: write
7171
steps:
72-
- uses: actions/checkout@v4
72+
- uses: actions/checkout@v5
7373
- uses: ./.github/actions/setup-build
7474
- name: Setup Testcontainers Cloud Client
7575
uses: atomicjar/testcontainers-cloud-setup-action@main
@@ -88,17 +88,17 @@ jobs:
8888
outputs:
8989
matrix: ${{ steps.set-matrix.outputs.matrix }}
9090
steps:
91-
- uses: actions/checkout@v4
91+
- uses: actions/checkout@v5
9292
- uses: ./.github/actions/setup-java
9393
- name: Setup Gradle Build Action
94-
uses: gradle/actions/setup-gradle@v4
94+
uses: gradle/actions/setup-gradle@v5
9595
- id: set-matrix
9696
env:
9797
# Since we override the tests executor,
9898
# we should not push empty results to the cache
9999
READ_ONLY_REMOTE_GRADLE_CACHE: true
100100
run: |
101-
TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
101+
TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":testcontainers-databend:check" or . == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
102102
echo $TASKS
103103
echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
104104
check:
@@ -110,7 +110,7 @@ jobs:
110110
permissions:
111111
checks: write
112112
steps:
113-
- uses: actions/checkout@v4
113+
- uses: actions/checkout@v5
114114
- uses: ./.github/actions/setup-build
115115
- name: Build and test with Gradle (${{matrix.gradle_args}})
116116
run: |
@@ -123,10 +123,10 @@ jobs:
123123
outputs:
124124
matrix: ${{ steps.set-matrix.outputs.matrix }}
125125
steps:
126-
- uses: actions/checkout@v4
126+
- uses: actions/checkout@v5
127127
- uses: ./.github/actions/setup-java
128128
- name: Setup Gradle Build Action
129-
uses: gradle/actions/setup-gradle@v4
129+
uses: gradle/actions/setup-gradle@v5
130130
- id: set-matrix
131131
working-directory: ./examples/
132132
env:
@@ -146,7 +146,7 @@ jobs:
146146
permissions:
147147
checks: write
148148
steps:
149-
- uses: actions/checkout@v4
149+
- uses: actions/checkout@v5
150150
- uses: ./.github/actions/setup-build
151151
- name: Build and test Examples with Gradle (${{matrix.gradle_args}})
152152
working-directory: ./examples/
@@ -160,10 +160,10 @@ jobs:
160160
outputs:
161161
matrix: ${{ steps.set-matrix.outputs.matrix }}
162162
steps:
163-
- uses: actions/checkout@v4
163+
- uses: actions/checkout@v5
164164
- uses: ./.github/actions/setup-java
165165
- name: Setup Gradle Build Action
166-
uses: gradle/actions/setup-gradle@v4
166+
uses: gradle/actions/setup-gradle@v5
167167
- id: set-matrix
168168
env:
169169
# Since we override the tests executor,
@@ -182,7 +182,7 @@ jobs:
182182
permissions:
183183
checks: write
184184
steps:
185-
- uses: actions/checkout@v4
185+
- uses: actions/checkout@v5
186186
- uses: ./.github/actions/setup-build
187187
- name: Build and test with Gradle (${{matrix.gradle_args}})
188188
run: |

.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/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v5
12+
- uses: actions/labeler@v6
1313
with:
1414
repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/moby-latest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-22.04
2222
continue-on-error: true
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- uses: ./.github/actions/setup-build
2626

2727
- name: Install Stable Docker
@@ -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: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
release:
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
- uses: ./.github/actions/setup-java
2020
- name: Clear existing docker image cache
2121
run: docker image prune -af
2222

2323
- name: Setup Gradle Build Action
24-
uses: gradle/actions/setup-gradle@v4
24+
uses: gradle/actions/setup-gradle@v5
2525

2626
- name: Run Gradle Build
2727
run: ./gradlew build --scan --no-daemon -i -x test
@@ -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 }}

0 commit comments

Comments
 (0)