Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combined dependencies PR #7713

Merged
merged 47 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
c0e9e40
Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0 in /modules/azure
dependabot[bot] Oct 23, 2023
9a355ef
Bump redis.clients:jedis from 5.0.1 to 5.0.2 in /core
dependabot[bot] Oct 23, 2023
e4960dd
Bump redis.clients:jedis from 5.0.1 to 5.0.2 in /modules/junit-jupiter
dependabot[bot] Oct 23, 2023
69991a5
Bump org.elasticsearch.client:elasticsearch-rest-client
dependabot[bot] Oct 23, 2023
c7aa76f
Bump com.squareup.okhttp3:okhttp in /modules/couchbase
dependabot[bot] Oct 23, 2023
b9b89b2
Bump software.amazon.awssdk:s3 in /modules/localstack
dependabot[bot] Oct 23, 2023
99cdda6
Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0 in /modules/solr
dependabot[bot] Oct 23, 2023
45dbe1a
Bump io.trino:trino-jdbc from 428 to 430 in /modules/trino
dependabot[bot] Oct 23, 2023
a3b0ab3
Bump release-drafter/release-drafter from 5.24.0 to 5.25.0
dependabot[bot] Oct 23, 2023
2fc99e1
Bump com.hazelcast:hazelcast from 5.3.2 to 5.3.4 in /examples
dependabot[bot] Oct 23, 2023
3fe6992
Bump com.hivemq:hivemq-extension-sdk in /modules/hivemq
dependabot[bot] Oct 23, 2023
f88db7d
Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc
dependabot[bot] Oct 23, 2023
d4f3a9a
Bump org.springframework.boot from 2.7.16 to 2.7.17 in /examples
dependabot[bot] Oct 23, 2023
d048b82
Bump io.projectreactor:reactor-core in /modules/r2dbc
dependabot[bot] Oct 23, 2023
e5b0e7d
Bump com.google.guava:guava from 32.1.2-jre to 32.1.3-jre in /core
dependabot[bot] Oct 23, 2023
d05ab8d
Bump org.mongodb:mongodb-driver-sync in /modules/mongodb
dependabot[bot] Oct 23, 2023
0d08b69
Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0 in /examples
dependabot[bot] Oct 23, 2023
d5e6abf
Bump com.google.cloud:libraries-bom in /modules/gcloud
dependabot[bot] Oct 23, 2023
b305866
Bump io.nats:jnats from 2.17.0 to 2.17.1 in /examples
dependabot[bot] Oct 23, 2023
199274b
Bump redis.clients:jedis from 5.0.1 to 5.0.2 in /examples
dependabot[bot] Oct 23, 2023
3b687cc
Bump com.gradle:common-custom-user-data-gradle-plugin
dependabot[bot] Oct 23, 2023
72027c0
Bump com.amazonaws:aws-java-sdk-dynamodb in /modules/dynalite
dependabot[bot] Oct 23, 2023
7037fe1
Bump com.amazonaws:aws-java-sdk-bom in /modules/localstack
dependabot[bot] Oct 23, 2023
98f4de9
Bump com.gradle:common-custom-user-data-gradle-plugin in /examples
dependabot[bot] Oct 23, 2023
609a8c9
Merge remote-tracking branch 'origin/dependabot/gradle/modules/locals…
eddumelendez Oct 24, 2023
71ed98f
Merge remote-tracking branch 'origin/dependabot/gradle/modules/dynali…
eddumelendez Oct 24, 2023
acb4b37
Merge remote-tracking branch 'origin/dependabot/gradle/com.gradle-com…
eddumelendez Oct 24, 2023
645af85
Merge remote-tracking branch 'origin/dependabot/gradle/examples/redis…
eddumelendez Oct 24, 2023
64621e2
Merge remote-tracking branch 'origin/dependabot/gradle/examples/io.na…
eddumelendez Oct 24, 2023
1e28b2f
Merge remote-tracking branch 'origin/dependabot/gradle/examples/com.s…
eddumelendez Oct 24, 2023
558dc24
Merge remote-tracking branch 'origin/dependabot/gradle/examples/org.s…
eddumelendez Oct 24, 2023
3b23f68
Merge remote-tracking branch 'origin/dependabot/gradle/examples/com.h…
eddumelendez Oct 24, 2023
30b6908
Merge remote-tracking branch 'origin/dependabot/github_actions/releas…
eddumelendez Oct 24, 2023
603809f
Merge remote-tracking branch 'origin/dependabot/gradle/modules/trino/…
eddumelendez Oct 24, 2023
7ce7b43
Merge remote-tracking branch 'origin/dependabot/gradle/modules/solr/c…
eddumelendez Oct 24, 2023
2a72caf
Merge remote-tracking branch 'origin/dependabot/gradle/modules/couchb…
eddumelendez Oct 24, 2023
4294019
Merge remote-tracking branch 'origin/dependabot/gradle/modules/locals…
eddumelendez Oct 24, 2023
760b6f2
Merge remote-tracking branch 'origin/dependabot/gradle/modules/junit-…
eddumelendez Oct 24, 2023
780e013
Merge remote-tracking branch 'origin/dependabot/gradle/modules/elasti…
eddumelendez Oct 24, 2023
d716014
Merge remote-tracking branch 'origin/dependabot/gradle/core/redis.cli…
eddumelendez Oct 24, 2023
b0f98b9
Merge remote-tracking branch 'origin/dependabot/gradle/modules/azure/…
eddumelendez Oct 24, 2023
5fbcaf1
Merge remote-tracking branch 'origin/dependabot/gradle/modules/mongod…
eddumelendez Oct 24, 2023
a79921d
Merge remote-tracking branch 'origin/dependabot/gradle/modules/gcloud…
eddumelendez Oct 24, 2023
78a1a78
Merge remote-tracking branch 'origin/dependabot/gradle/modules/r2dbc/…
eddumelendez Oct 24, 2023
31a6966
Merge remote-tracking branch 'origin/dependabot/gradle/modules/jdbc/o…
eddumelendez Oct 24, 2023
e810fb0
Merge remote-tracking branch 'origin/dependabot/gradle/core/com.googl…
eddumelendez Oct 24, 2023
e698b14
Merge remote-tracking branch 'origin/dependabot/gradle/modules/hivemq…
eddumelendez Oct 24, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
if: github.repository == 'testcontainers/testcontainers-java'
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@65c5fb495d1e69aa8c08a3317bc44ff8aabe9772 # v5.19.0
- uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5.19.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ dependencies {

api 'com.github.docker-java:docker-java-transport-zerodep'

shaded 'com.google.guava:guava:32.1.2-jre'
shaded 'com.google.guava:guava:32.1.3-jre'
shaded "org.yaml:snakeyaml:1.33"

shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
Expand All @@ -110,7 +110,7 @@ dependencies {
exclude group: 'com.google.guava', module: 'guava'
}
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
testImplementation 'redis.clients:jedis:5.0.1'
testImplementation 'redis.clients:jedis:5.0.2'
testImplementation 'com.rabbitmq:amqp-client:5.19.0'
testImplementation 'org.mongodb:mongo-java-driver:3.12.14'

Expand Down
2 changes: 1 addition & 1 deletion examples/hazelcast/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {

dependencies {
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'com.hazelcast:hazelcast:5.3.2'
testImplementation 'com.hazelcast:hazelcast:5.3.4'
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
Expand Down
2 changes: 1 addition & 1 deletion examples/linked-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repositories {
}
dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.36'
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'org.json:json:20230618'
testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
Expand Down
2 changes: 1 addition & 1 deletion examples/nats/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {
dependencies {
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'io.nats:jnats:2.17.0'
testImplementation 'io.nats:jnats:2.17.1'
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
Expand Down
2 changes: 1 addition & 1 deletion examples/redis-backed-cache-testng/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {

dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.36'
implementation 'redis.clients:jedis:5.0.1'
implementation 'redis.clients:jedis:5.0.2'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.google.guava:guava:23.0'
testImplementation 'org.testcontainers:testcontainers'
Expand Down
2 changes: 1 addition & 1 deletion examples/redis-backed-cache/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {

dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.36'
implementation 'redis.clients:jedis:5.0.1'
implementation 'redis.clients:jedis:5.0.2'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.google.guava:guava:23.0'
testImplementation 'org.testcontainers:testcontainers'
Expand Down
2 changes: 1 addition & 1 deletion examples/selenium-container/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.16'
id 'org.springframework.boot' version '2.7.17'
}
apply plugin: 'io.spring.dependency-management'

Expand Down
2 changes: 1 addition & 1 deletion examples/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
dependencies {
classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15.1"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12"
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/singleton-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {

dependencies {

implementation 'redis.clients:jedis:5.0.1'
implementation 'redis.clients:jedis:5.0.2'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.google.guava:guava:23.0'
compileOnly 'org.slf4j:slf4j-api:1.7.36'
Expand Down
2 changes: 1 addition & 1 deletion examples/spring-boot/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.16'
id 'org.springframework.boot' version '2.7.17'
}
apply plugin: 'io.spring.dependency-management'

Expand Down
2 changes: 1 addition & 1 deletion modules/azure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Azure"
dependencies {
api project(':testcontainers')
// TODO use JDK's HTTP client and/or Apache HttpClient5
shaded 'com.squareup.okhttp3:okhttp:4.11.0'
shaded 'com.squareup.okhttp3:okhttp:4.12.0'

testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'com.azure:azure-cosmos:4.51.0'
Expand Down
2 changes: 1 addition & 1 deletion modules/couchbase/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Couchbase"
dependencies {
api project(':testcontainers')
// TODO use JDK's HTTP client and/or Apache HttpClient5
shaded 'com.squareup.okhttp3:okhttp:4.11.0'
shaded 'com.squareup.okhttp3:okhttp:4.12.0'

testImplementation 'com.couchbase.client:java-client:3.4.11'
testImplementation 'org.awaitility:awaitility:4.2.0'
Expand Down
4 changes: 2 additions & 2 deletions modules/dynalite/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
dependencies {
api project(':testcontainers')

compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.565'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.565'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.572'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.572'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/elasticsearch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"

dependencies {
api project(':testcontainers')
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.10.2"
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.10.4"
testImplementation "org.elasticsearch.client:transport:7.17.13"
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/gcloud/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
dependencies {
api project(':testcontainers')

testImplementation platform("com.google.cloud:libraries-bom:26.24.0")
testImplementation platform("com.google.cloud:libraries-bom:26.25.0")
testImplementation 'com.google.cloud:google-cloud-bigquery'
testImplementation 'com.google.cloud:google-cloud-datastore'
testImplementation 'com.google.cloud:google-cloud-firestore'
Expand Down
2 changes: 1 addition & 1 deletion modules/hivemq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {

testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
testImplementation(project(":junit-jupiter"))
testImplementation("com.hivemq:hivemq-extension-sdk:4.20.0")
testImplementation("com.hivemq:hivemq-extension-sdk:4.21.0")
testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
testImplementation("ch.qos.logback:logback-classic:1.4.11")
Expand Down
2 changes: 1 addition & 1 deletion modules/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies {
compileOnly 'org.jetbrains:annotations:24.0.1'
testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
testImplementation 'org.vibur:vibur-dbcp:25.0'
testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.13'
testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.15'
testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation ('org.mockito:mockito-core:4.11.0') {
Expand Down
2 changes: 1 addition & 1 deletion modules/junit-jupiter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {
testImplementation project(':mysql')
testImplementation project(':postgresql')
testImplementation 'com.zaxxer:HikariCP:4.0.3'
testImplementation 'redis.clients:jedis:5.0.1'
testImplementation 'redis.clients:jedis:5.0.2'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
testImplementation ('org.mockito:mockito-core:4.11.0') {
exclude(module: 'hamcrest-core')
Expand Down
4 changes: 2 additions & 2 deletions modules/localstack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ description = "Testcontainers :: Localstack"
dependencies {
api project(':testcontainers')

testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.565")
testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.572")
testImplementation 'com.amazonaws:aws-java-sdk-s3'
testImplementation 'com.amazonaws:aws-java-sdk-sqs'
testImplementation 'com.amazonaws:aws-java-sdk-logs'
testImplementation 'software.amazon.awssdk:s3:2.20.162'
testImplementation 'software.amazon.awssdk:s3:2.21.5'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/mongodb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description = "Testcontainers :: MongoDB"
dependencies {
api project(':testcontainers')

testImplementation("org.mongodb:mongodb-driver-sync:4.10.2")
testImplementation("org.mongodb:mongodb-driver-sync:4.11.0")
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/r2dbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ dependencies {
testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
testImplementation project(':postgresql')

testFixturesImplementation 'io.projectreactor:reactor-core:3.5.10'
testFixturesImplementation 'io.projectreactor:reactor-core:3.5.11'
testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/solr/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"
dependencies {
api project(':testcontainers')
// TODO use JDK's HTTP client and/or Apache HttpClient5
shaded 'com.squareup.okhttp3:okhttp:4.11.0'
shaded 'com.squareup.okhttp3:okhttp:4.12.0'

testImplementation 'org.apache.solr:solr-solrj:8.11.2'
testImplementation 'org.assertj:assertj-core:3.24.2'
Expand Down
2 changes: 1 addition & 1 deletion modules/trino/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ dependencies {
api project(':jdbc')

testImplementation project(':jdbc-test')
testRuntimeOnly 'io.trino:trino-jdbc:428'
testRuntimeOnly 'io.trino:trino-jdbc:430'
compileOnly 'org.jetbrains:annotations:24.0.1'
}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15.1"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12"
classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
}
}
Expand Down
Loading