Skip to content

Commit b675d8d

Browse files
authored
Merge branch 'main' into java-25
2 parents 6c6affb + 9654cf1 commit b675d8d

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
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 }}"

buildSrc/src/main/groovy/org/testcontainers/build/ComparePOMWithLatestReleasedTask.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.testcontainers.build
22

3+
import groovy.xml.XmlSlurper
34
import org.gradle.api.DefaultTask
45
import org.gradle.api.tasks.Input
56
import org.gradle.api.tasks.TaskAction

core/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ 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'
75-
api 'org.apache.commons:commons-compress:1.24.0'
73+
compileOnly 'org.jetbrains:annotations:26.0.2-1'
74+
testCompileOnly 'org.jetbrains:annotations:26.0.2-1'
75+
api 'org.apache.commons:commons-compress:1.28.0'
7676
api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
7777
exclude(group: 'org.jetbrains', module: 'annotations')
7878
}
@@ -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

@@ -109,7 +109,7 @@ dependencies {
109109
exclude group: 'com.google.guava', module: 'guava'
110110
}
111111
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
112-
testImplementation 'redis.clients:jedis:6.1.0'
112+
testImplementation 'redis.clients:jedis:6.2.0'
113113
testImplementation 'com.rabbitmq:amqp-client:5.26.0'
114114
testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
115115

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

122-
testImplementation 'org.assertj:assertj-core:3.27.4'
122+
testImplementation 'org.assertj:assertj-core:3.27.6'
123123
testImplementation 'io.rest-assured:rest-assured:5.5.6'
124124

125125
jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
126126
jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
127127
jarFileTestImplementation 'junit:junit:4.13.2'
128-
jarFileTestImplementation 'org.assertj:assertj-core:3.27.4'
128+
jarFileTestImplementation 'org.assertj:assertj-core:3.27.6'
129129
jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
130130
}
131131

examples/selenium-container/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version '2.7.18'
3+
id 'org.springframework.boot' version '3.5.6'
44
}
55
apply plugin: 'io.spring.dependency-management'
66

@@ -17,7 +17,6 @@ dependencies {
1717
testImplementation 'org.testcontainers:testcontainers-selenium'
1818
testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
1919
testImplementation 'org.assertj:assertj-core:3.27.4'
20-
testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.8.2"
2120
}
2221

2322
test {

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

modules/qdrant/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
99
testImplementation 'org.assertj:assertj-core:3.27.4'
1010
testImplementation 'io.qdrant:client:1.15.0'
11-
testImplementation platform('io.grpc:grpc-bom:1.73.0')
11+
testImplementation platform('io.grpc:grpc-bom:1.75.0')
1212
testImplementation 'io.grpc:grpc-stub'
1313
testImplementation 'io.grpc:grpc-protobuf'
1414
testImplementation 'io.grpc:grpc-netty-shaded'

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)