Skip to content

Commit d776d4b

Browse files
eddumelendezeddumelendez
authored
Merge branch 'main' into fix-mysql-9.3
2 parents f329d13 + 1aec92b commit d776d4b

File tree

69 files changed

+401
-445
lines changed

Some content is hidden

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

69 files changed

+401
-445
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,6 @@ updates:
161161
schedule:
162162
interval: "monthly"
163163
open-pull-requests-limit: 10
164-
ignore:
165-
- dependency-name: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
166-
update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
167164
- package-ecosystem: "gradle"
168165
directory: "/modules/kafka"
169166
schedule:

‎core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ dependencies {
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.25.0'
113+
testImplementation 'com.rabbitmq:amqp-client:5.26.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description = "Examples for docs"
33
dependencies {
44
testImplementation "junit:junit:4.13.2"
55
testImplementation project(":testcontainers")
6-
testImplementation project(":selenium")
7-
testImplementation project(":mysql")
6+
testImplementation project(":testcontainers-selenium")
7+
testImplementation project(":testcontainers-mysql")
88

99
testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
1010
testImplementation "org.seleniumhq.selenium:selenium-api:4.34.0"

‎docs/examples/junit5/redis/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ description = "Examples for docs"
33
dependencies {
44
api "io.lettuce:lettuce-core:6.7.1.RELEASE"
55

6-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.3'
7-
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.3'
8-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.3'
6+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
7+
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
8+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
99
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
1010
testImplementation project(":testcontainers")
11-
testImplementation project(":junit-jupiter")
11+
testImplementation project(":testcontainers-junit-jupiter")
1212
testImplementation 'org.assertj:assertj-core:3.27.3'
1313
}
1414

‎docs/examples/spock/redis/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
dependencies {
77
api "io.lettuce:lettuce-core:6.7.1.RELEASE"
88
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
9-
testImplementation project(":spock")
9+
testImplementation project(":testcontainers-spock")
1010
testImplementation 'ch.qos.logback:logback-classic:1.3.15'
1111
}
1212

‎docs/modules/localstack.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ public LocalStackContainer localstack = new LocalStackContainer(localstackImage)
1616

1717
## Creating a client using AWS SDK
1818

19-
<!--codeinclude-->
20-
[AWS SDK V1](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_aws_sdk_v1
21-
<!--/codeinclude-->
22-
2319
<!--codeinclude-->
2420
[AWS SDK V2](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_aws_sdk_v2
2521
<!--/codeinclude-->

‎examples/cucumber/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ dependencies {
1212
implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
1313
implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
1414

15-
testImplementation platform('org.junit:junit-bom:5.13.3')
15+
testImplementation platform('org.junit:junit-bom:5.13.4')
1616
testImplementation 'org.junit.platform:junit-platform-suite'
17-
testImplementation platform('io.cucumber:cucumber-bom:7.23.0')
17+
testImplementation platform('io.cucumber:cucumber-bom:7.27.0')
1818
testImplementation 'io.cucumber:cucumber-java'
1919
testImplementation 'io.cucumber:cucumber-junit-platform-engine'
20-
testImplementation 'org.testcontainers:selenium'
21-
testImplementation 'org.assertj:assertj-core:3.26.3'
20+
testImplementation 'org.testcontainers:testcontainers-selenium'
21+
testImplementation 'org.assertj:assertj-core:3.27.3'
2222
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
2323
}
2424

‎examples/hazelcast/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ repositories {
99
dependencies {
1010
testImplementation 'org.testcontainers:testcontainers'
1111
testImplementation 'com.hazelcast:hazelcast:5.3.8'
12-
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
13-
testImplementation 'org.assertj:assertj-core:3.26.3'
14-
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
12+
testImplementation 'ch.qos.logback:logback-classic:1.3.15'
13+
testImplementation 'org.assertj:assertj-core:3.27.3'
14+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
1515
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
1616
}
1717

‎examples/immudb/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ repositories {
99
dependencies {
1010
implementation 'io.codenotary:immudb4j:1.0.1'
1111
testImplementation 'org.testcontainers:testcontainers'
12-
testImplementation 'org.testcontainers:junit-jupiter'
13-
testImplementation 'org.assertj:assertj-core:3.26.3'
12+
testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
13+
testImplementation 'org.assertj:assertj-core:3.27.3'
1414
testImplementation 'com.google.guava:guava:23.0'
15-
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
16-
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
15+
testImplementation 'ch.qos.logback:logback-classic:1.3.15'
16+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
1717
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
1818
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
1919
}

‎examples/kafka-cluster/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ repositories {
99
dependencies {
1010
testCompileOnly "org.projectlombok:lombok:1.18.38"
1111
testAnnotationProcessor "org.projectlombok:lombok:1.18.38"
12-
testImplementation 'org.testcontainers:kafka'
12+
testImplementation 'org.testcontainers:testcontainers-kafka'
1313
testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
14-
testImplementation 'org.assertj:assertj-core:3.26.3'
14+
testImplementation 'org.assertj:assertj-core:3.27.3'
1515
testImplementation 'com.google.guava:guava:23.0'
16-
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
17-
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
18-
testImplementation 'org.awaitility:awaitility:4.2.2'
16+
testImplementation 'ch.qos.logback:logback-classic:1.3.15'
17+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
18+
testImplementation 'org.awaitility:awaitility:4.3.0'
1919
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
2020
}
2121

0 commit comments

Comments
 (0)