Skip to content

Commit d09460a

Browse files
authored
Merge branch 'main' into add-support-for-weaviate-v1.29
2 parents d821129 + e495651 commit d09460a

File tree

199 files changed

+1536
-1029
lines changed

Some content is hidden

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

199 files changed

+1536
-1029
lines changed

.github/dependabot.yml

Lines changed: 65 additions & 75 deletions
Large diffs are not rendered by default.

.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.0
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ plugins {
1515
id 'com.gradleup.shadow' version '8.3.0'
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"
@@ -135,7 +136,7 @@ subprojects {
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ configurations.all {
7171
dependencies {
7272
api 'junit:junit:4.13.2'
7373
api 'org.slf4j:slf4j-api:1.7.36'
74-
compileOnly 'org.jetbrains:annotations:24.1.0'
75-
testCompileOnly 'org.jetbrains:annotations:24.1.0'
74+
compileOnly 'org.jetbrains:annotations:26.0.2'
75+
testCompileOnly 'org.jetbrains:annotations:26.0.2'
7676
api 'org.apache.commons:commons-compress:1.24.0'
7777
api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
7878
exclude(group: 'org.jetbrains', module: 'annotations')
@@ -88,8 +88,8 @@ dependencies {
8888

8989
shaded 'org.awaitility:awaitility:4.2.0'
9090

91-
api platform('com.github.docker-java:docker-java-bom:3.4.1')
92-
shaded platform('com.github.docker-java:docker-java-bom:3.4.1')
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')
9393

9494
api "com.github.docker-java:docker-java-api"
9595

@@ -110,7 +110,7 @@ dependencies {
110110
exclude group: 'com.google.guava', module: 'guava'
111111
}
112112
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
113-
testImplementation 'redis.clients:jedis:5.1.5'
113+
testImplementation 'redis.clients:jedis:6.0.0'
114114
testImplementation 'com.rabbitmq:amqp-client:5.22.0'
115115
testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
116116

@@ -120,13 +120,13 @@ dependencies {
120120
// Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
121121
testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
122122

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

126126
jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
127127
jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
128128
jarFileTestImplementation 'junit:junit:4.13.2'
129-
jarFileTestImplementation 'org.assertj:assertj-core:3.26.3'
129+
jarFileTestImplementation 'org.assertj:assertj-core:3.27.3'
130130
jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
131131
}
132132

0 commit comments

Comments
 (0)