Skip to content

Commit

Permalink
Merge pull request #7584 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez committed Sep 26, 2023
2 parents 5d0631f + 0a84fb4 commit 95b2af9
Show file tree
Hide file tree
Showing 26 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/combine-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
steps:
- name: combine-prs
id: combine-prs
uses: github/combine-prs@v3.1.2
uses: github/combine-prs@v4.0.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ dependencies {
api 'org.slf4j:slf4j-api:1.7.36'
compileOnly 'org.jetbrains:annotations:24.0.1'
testCompileOnly 'org.jetbrains:annotations:24.0.1'
api 'org.apache.commons:commons-compress:1.23.0'
api 'org.apache.commons:commons-compress:1.24.0'
api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
exclude(group: 'org.jetbrains', module: 'annotations')
}
Expand Down
2 changes: 1 addition & 1 deletion examples/cucumber/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

testImplementation platform('io.cucumber:cucumber-bom:7.13.0')
testImplementation platform('io.cucumber:cucumber-bom:7.14.0')
testImplementation 'io.cucumber:cucumber-java'
testImplementation 'io.cucumber:cucumber-junit'
testImplementation 'org.testcontainers:selenium'
Expand Down
4 changes: 2 additions & 2 deletions examples/kafka-cluster/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ repositories {
}

dependencies {
testCompileOnly "org.projectlombok:lombok:1.18.28"
testAnnotationProcessor "org.projectlombok:lombok:1.18.28"
testCompileOnly "org.projectlombok:lombok:1.18.30"
testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
testImplementation 'org.testcontainers:kafka'
testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
testImplementation 'org.assertj:assertj-core:3.24.2'
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.15'
id 'org.springframework.boot' version '2.7.16'
}
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.14.1"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
}
}

Expand Down
4 changes: 2 additions & 2 deletions examples/solr-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ repositories {
}

dependencies {
compileOnly "org.projectlombok:lombok:1.18.28"
annotationProcessor "org.projectlombok:lombok:1.18.28"
compileOnly "org.projectlombok:lombok:1.18.30"
annotationProcessor "org.projectlombok:lombok:1.18.30"

implementation 'org.apache.solr:solr-solrj:8.11.2'

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.15'
id 'org.springframework.boot' version '2.7.16'
}
apply plugin: 'io.spring.dependency-management'

Expand Down
2 changes: 1 addition & 1 deletion modules/consul/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ dependencies {
api project(':testcontainers')

testImplementation 'com.ecwid.consul:consul-api:1.4.5'
testImplementation 'io.rest-assured:rest-assured:5.3.1'
testImplementation 'io.rest-assured:rest-assured:5.3.2'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/couchbase/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
// TODO use JDK's HTTP client and/or Apache HttpClient5
shaded 'com.squareup.okhttp3:okhttp:4.11.0'

testImplementation 'com.couchbase.client:java-client:3.4.9'
testImplementation 'com.couchbase.client:java-client:3.4.10'
testImplementation 'org.awaitility:awaitility:4.2.0'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
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.545'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.545'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.557'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.557'
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.9.1"
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.10.2"
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.22.0")
testImplementation platform("com.google.cloud:libraries-bom:26.23.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.19.0")
testImplementation("com.hivemq:hivemq-extension-sdk:4.20.0")
testImplementation("com.hivemq:hivemq-mqtt-client:1.3.2")
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-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies {
api 'com.google.guava:guava:32.1.2-jre'
api 'org.apache.commons:commons-lang3:3.13.0'
api 'com.zaxxer:HikariCP-java6:2.3.13'
api 'commons-dbutils:commons-dbutils:1.8.0'
api 'commons-dbutils:commons-dbutils:1.8.1'

api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'

Expand Down
2 changes: 1 addition & 1 deletion modules/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies {
api project(':database-commons')

compileOnly 'org.jetbrains:annotations:24.0.1'
testImplementation 'commons-dbutils:commons-dbutils:1.8.0'
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 'com.zaxxer:HikariCP-java6:2.3.13'
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.545")
testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.557")
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.142'
testImplementation 'software.amazon.awssdk:s3:2.20.154'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/minio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description = "Testcontainers :: MinIO"
dependencies {
api project(':testcontainers')

testImplementation("io.minio:minio:8.5.5")
testImplementation("io.minio:minio:8.5.6")
testImplementation 'org.assertj:assertj-core:3.24.2'
}
4 changes: 2 additions & 2 deletions modules/mysql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ dependencies {
api project(':jdbc')

compileOnly project(':r2dbc')
compileOnly 'io.asyncer:r2dbc-mysql:1.0.2'
compileOnly 'io.asyncer:r2dbc-mysql:1.0.3'

testImplementation project(':jdbc-test')
testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'

testImplementation testFixtures(project(':r2dbc'))
testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.2'
testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.3'

compileOnly 'org.jetbrains:annotations:24.0.1'
}
4 changes: 2 additions & 2 deletions modules/orientdb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ description = "Testcontainers :: Orientdb"
dependencies {
api project(":testcontainers")

api "com.orientechnologies:orientdb-client:3.2.22"
api "com.orientechnologies:orientdb-client:3.2.23"

testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.0'
testImplementation "com.orientechnologies:orientdb-gremlin:3.2.22"
testImplementation "com.orientechnologies:orientdb-gremlin:3.2.23"
}
2 changes: 1 addition & 1 deletion modules/questdb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
testImplementation project(':jdbc-test')
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.questdb:questdb:7.3.1'
testImplementation 'org.questdb:questdb:7.3.2'
testImplementation 'org.awaitility:awaitility:4.2.0'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
}
Expand Down
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.9'
testFixturesImplementation 'io.projectreactor:reactor-core:3.5.10'
testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/redpanda/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dependencies {

testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'io.rest-assured:rest-assured:5.3.1'
testImplementation 'io.rest-assured:rest-assured:5.3.2'
}
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:425'
testRuntimeOnly 'io.trino:trino-jdbc:426'
compileOnly 'org.jetbrains:annotations:24.0.1'
}
2 changes: 1 addition & 1 deletion modules/vault/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies {
api project(':testcontainers')

testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
testImplementation 'io.rest-assured:rest-assured:5.3.1'
testImplementation 'io.rest-assured:rest-assured:5.3.2'
testImplementation 'org.assertj:assertj-core:3.24.2'

}
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.14.1"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
}
}
Expand Down

0 comments on commit 95b2af9

Please sign in to comment.