Skip to content

Commit 723c5d9

Browse files
authored
Merge pull request #10798 from testcontainers/combined-pr-branch
Combined dependencies PR
2 parents 851f8ff + 97286f6 commit 723c5d9

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.github/workflows/ci-windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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: |
@@ -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/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 }}"

core/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ configurations.all {
7070
dependencies {
7171
api 'junit:junit:4.13.2'
7272
api 'org.slf4j:slf4j-api:1.7.36'
73-
compileOnly 'org.jetbrains:annotations:26.0.2'
74-
testCompileOnly 'org.jetbrains:annotations:26.0.2'
73+
compileOnly 'org.jetbrains:annotations:26.0.2-1'
74+
testCompileOnly 'org.jetbrains:annotations:26.0.2-1'
7575
api 'org.apache.commons:commons-compress:1.24.0'
7676
api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
7777
exclude(group: 'org.jetbrains', module: 'annotations')
@@ -87,8 +87,8 @@ dependencies {
8787

8888
shaded 'org.awaitility:awaitility:4.3.0'
8989

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')
90+
api platform('com.github.docker-java:docker-java-bom:3.6.0')
91+
shaded platform('com.github.docker-java:docker-java-bom:3.6.0')
9292

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

@@ -99,7 +99,7 @@ dependencies {
9999
api 'com.github.docker-java:docker-java-transport-zerodep'
100100

101101
shaded 'com.google.guava:guava:33.3.1-jre'
102-
shaded "org.yaml:snakeyaml:2.4"
102+
shaded "org.yaml:snakeyaml:2.5"
103103

104104
shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
105105

modules/orientdb/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99

1010
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
1111
testImplementation 'org.assertj:assertj-core:3.27.4'
12-
testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.3'
12+
testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.4'
1313
testImplementation "com.orientechnologies:orientdb-gremlin:3.2.43"
1414
}
1515

modules/pinecone/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies {
66
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
77

88
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
9-
testImplementation 'org.assertj:assertj-core:3.27.3'
9+
testImplementation 'org.assertj:assertj-core:3.27.4'
1010
testImplementation 'io.pinecone:pinecone-client:3.1.0'
1111
}
1212

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77
dependencies {
88
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.19.2"
9-
classpath "com.gradle:common-custom-user-data-gradle-plugin:2.3"
9+
classpath "com.gradle:common-custom-user-data-gradle-plugin:2.4.0"
1010
classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
1111
}
1212
}

0 commit comments

Comments
 (0)