Skip to content

Commit 964a4d9

Browse files
authored
Merge pull request #11076 from testcontainers/combined-pr-branch
Combined dependencies PR
2 parents 4486913 + dbad28d commit 964a4d9

File tree

19 files changed

+24
-24
lines changed

19 files changed

+24
-24
lines changed

.github/workflows/ci-rootless.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
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.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
- 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,
@@ -126,7 +126,7 @@ jobs:
126126
- 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:
@@ -163,7 +163,7 @@ jobs:
163163
- 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,

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
repo-token: ${{ secrets.GITHUB_TOKEN }}
2525
labels: dependencies
2626

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

core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ dependencies {
149149
jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
150150
jarFileTestRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
151151
jarFileTestImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
152-
jarFileTestImplementation 'org.assertj:assertj-core:3.27.4'
152+
jarFileTestImplementation 'org.assertj:assertj-core:3.27.6'
153153
jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
154154
}
155155

modules/couchbase/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies {
55
// TODO use JDK's HTTP client and/or Apache HttpClient5
66
shaded 'com.squareup.okhttp3:okhttp:5.1.0'
77

8-
testImplementation 'com.couchbase.client:java-client:3.9.0'
8+
testImplementation 'com.couchbase.client:java-client:3.9.1'
99
testImplementation 'org.awaitility:awaitility:4.3.0'
1010
}
1111

modules/gcloud/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
33
dependencies {
44
api project(':testcontainers')
55

6-
testImplementation platform("com.google.cloud:libraries-bom:26.66.0")
6+
testImplementation platform("com.google.cloud:libraries-bom:26.69.0")
77
testImplementation 'com.google.cloud:google-cloud-bigquery'
88
testImplementation 'com.google.cloud:google-cloud-datastore'
99
testImplementation 'com.google.cloud:google-cloud-firestore'

modules/grafana/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ dependencies {
44
api project(':testcontainers')
55

66
testImplementation 'io.rest-assured:rest-assured:5.5.6'
7-
testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.3'
7+
testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.4'
88
testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
99

10-
testImplementation platform('io.opentelemetry:opentelemetry-bom:1.53.0')
10+
testImplementation platform('io.opentelemetry:opentelemetry-bom:1.54.1')
1111
testImplementation 'io.opentelemetry:opentelemetry-api'
1212
testImplementation 'io.opentelemetry:opentelemetry-sdk'
1313
testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'

modules/hivemq/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
shaded("net.lingala.zip4j:zip4j:2.11.5")
1313

1414
testImplementation(project(":testcontainers-junit-jupiter"))
15-
testImplementation("com.hivemq:hivemq-extension-sdk:4.42.0")
15+
testImplementation("com.hivemq:hivemq-extension-sdk:4.45.0")
1616
testImplementation("com.hivemq:hivemq-mqtt-client:1.3.8")
1717
testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
1818
testImplementation("ch.qos.logback:logback-classic:1.5.18")

modules/junit-jupiter/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ dependencies {
88
testImplementation project(':testcontainers-mysql')
99
testImplementation project(':testcontainers-postgresql')
1010
testImplementation 'com.zaxxer:HikariCP:7.0.2'
11-
testImplementation 'redis.clients:jedis:6.1.0'
11+
testImplementation 'redis.clients:jedis:6.2.0'
1212
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
1313
testImplementation ('org.mockito:mockito-core:4.11.0') {
1414
exclude(module: 'hamcrest-core')
1515
}
1616

17-
testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
17+
testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
1818
testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
1919
}

0 commit comments

Comments
 (0)