Skip to content

Commit be0e14e

Browse files
authored
Merge branch 'main' into upgrade-jackson-snakeyaml
2 parents 14deb03 + ef4aa7e commit be0e14e

File tree

36 files changed

+57
-54
lines changed

36 files changed

+57
-54
lines changed

.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/[email protected].0
46+
uses: slackapi/[email protected].1
4747
with:
4848
payload: |
4949
{

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212

1313
plugins {
1414
id 'io.franzbecker.gradle-lombok' version '5.0.0'
15-
id 'com.gradleup.shadow' version '8.3.0'
15+
id 'com.gradleup.shadow' version '8.3.8'
1616
id 'me.champeau.gradle.japicmp' version '0.4.3' apply false
1717
id 'com.diffplug.spotless' version '6.22.0' apply false
1818
id 'org.jreleaser' version '1.18.0' apply false

core/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ dependencies {
7777
exclude(group: 'org.jetbrains', module: 'annotations')
7878
}
7979

80-
provided('com.google.cloud.tools:jib-core:0.23.0') {
80+
provided('com.google.cloud.tools:jib-core:0.27.3') {
8181
exclude group: 'com.google.guava', module: 'guava'
8282
exclude group: 'com.fasterxml.jackson.datatype', module: 'jackson-datatype-jsr310'
8383
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
8484
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
8585
exclude group: 'org.apache.commons', module: 'commons-compress'
8686
}
8787

88-
shaded 'org.awaitility:awaitility:4.2.0'
88+
shaded 'org.awaitility:awaitility:4.3.0'
8989

9090
api platform('com.github.docker-java:docker-java-bom:3.5.3')
9191
shaded platform('com.github.docker-java:docker-java-bom:3.5.3')
@@ -105,12 +105,12 @@ dependencies {
105105

106106
shaded 'org.zeroturnaround:zt-exec:1.12'
107107

108-
testImplementation('com.google.cloud.tools:jib-core:0.23.0') {
108+
testImplementation('com.google.cloud.tools:jib-core:0.27.3') {
109109
exclude group: 'com.google.guava', module: 'guava'
110110
}
111111
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
112112
testImplementation 'redis.clients:jedis:6.0.0'
113-
testImplementation 'com.rabbitmq:amqp-client:5.22.0'
113+
testImplementation 'com.rabbitmq:amqp-client:5.25.0'
114114
testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
115115

116116
testImplementation ('org.mockito:mockito-core:4.11.0') {

docs/examples/junit4/generic/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ dependencies {
77
testImplementation project(":mysql")
88

99
testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
10-
testImplementation "org.seleniumhq.selenium:selenium-api:4.25.0"
10+
testImplementation "org.seleniumhq.selenium:selenium-api:4.34.0"
1111
testImplementation 'org.assertj:assertj-core:3.27.3'
1212
}

examples/cucumber/build.gradle

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

1515
testImplementation platform('org.junit:junit-bom:5.10.3')
1616
testImplementation 'org.junit.platform:junit-platform-suite'
17-
testImplementation platform('io.cucumber:cucumber-bom:7.18.1')
17+
testImplementation platform('io.cucumber:cucumber-bom:7.23.0')
1818
testImplementation 'io.cucumber:cucumber-java'
1919
testImplementation 'io.cucumber:cucumber-junit-platform-engine'
2020
testImplementation 'org.testcontainers:selenium'

examples/kafka-cluster/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
testCompileOnly "org.projectlombok:lombok:1.18.34"
1111
testAnnotationProcessor "org.projectlombok:lombok:1.18.34"
1212
testImplementation 'org.testcontainers:kafka'
13-
testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
13+
testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
1414
testImplementation 'org.assertj:assertj-core:3.26.3'
1515
testImplementation 'com.google.guava:guava:23.0'
1616
testImplementation 'ch.qos.logback:logback-classic:1.3.14'

examples/solr-container/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
compileOnly "org.projectlombok:lombok:1.18.34"
1111
annotationProcessor "org.projectlombok:lombok:1.18.34"
1212

13-
implementation 'org.apache.solr:solr-solrj:8.11.3'
13+
implementation 'org.apache.solr:solr-solrj:8.11.4'
1414

1515
testImplementation 'org.testcontainers:testcontainers'
1616
testImplementation 'org.testcontainers:solr'

examples/zookeeper/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repositories {
77
}
88

99
dependencies {
10-
testImplementation 'org.apache.curator:curator-framework:5.7.0'
10+
testImplementation 'org.apache.curator:curator-framework:5.8.0'
1111
testImplementation 'org.testcontainers:testcontainers'
1212
testImplementation 'org.assertj:assertj-core:3.26.3'
1313
testImplementation 'ch.qos.logback:logback-classic:1.3.14'

modules/activemq/build.gradle

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

66
testImplementation 'org.assertj:assertj-core:3.27.3'
7-
testImplementation "org.apache.activemq:activemq-client:6.1.2"
8-
testImplementation "org.apache.activemq:artemis-jakarta-client:2.37.0"
7+
testImplementation "org.apache.activemq:activemq-client:6.1.7"
8+
testImplementation "org.apache.activemq:artemis-jakarta-client:2.41.0"
99
}

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:4.12.0'
77

8-
testImplementation 'com.couchbase.client:java-client:3.7.3'
8+
testImplementation 'com.couchbase.client:java-client:3.8.3'
99
testImplementation 'org.awaitility:awaitility:4.3.0'
1010
testImplementation 'org.assertj:assertj-core:3.27.3'
1111
}

0 commit comments

Comments
 (0)