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 #7519

Merged
merged 21 commits into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0e97b24
Bump redis.clients:jedis from 4.4.3 to 5.0.0 in /core
dependabot[bot] Sep 6, 2023
4ee01b4
Bump software.amazon.awssdk:s3 in /modules/localstack
dependabot[bot] Sep 6, 2023
9068e0f
Bump com.hivemq:hivemq-extension-sdk in /modules/hivemq
dependabot[bot] Sep 6, 2023
d7bf81b
Bump redis.clients:jedis from 4.4.3 to 5.0.0 in /modules/junit-jupiter
dependabot[bot] Sep 6, 2023
91e05cc
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 6, 2023
df81ab6
Bump org.json:json from 20230227 to 20230618 in /examples
dependabot[bot] Sep 6, 2023
8a8aa96
Bump com.amazonaws:aws-java-sdk-dynamodb in /modules/dynalite
dependabot[bot] Sep 6, 2023
00a1175
Bump org.gradle.toolchains:foojay-resolver in /examples
dependabot[bot] Sep 6, 2023
a535e78
Bump org.elasticsearch.client:transport in /modules/elasticsearch
dependabot[bot] Sep 6, 2023
9a20fc2
Bump com.amazonaws:aws-java-sdk-bom in /modules/localstack
dependabot[bot] Sep 6, 2023
610936b
Bump redis.clients:jedis from 4.4.3 to 5.0.0 in /examples
dependabot[bot] Sep 6, 2023
3673d66
Merge remote-tracking branch 'origin/dependabot/gradle/modules/locals…
eddumelendez Sep 7, 2023
8a6d058
Merge remote-tracking branch 'origin/dependabot/gradle/modules/elasti…
eddumelendez Sep 7, 2023
7171205
Merge remote-tracking branch 'origin/dependabot/gradle/examples/org.g…
eddumelendez Sep 7, 2023
9e492fd
Merge remote-tracking branch 'origin/dependabot/gradle/modules/dynali…
eddumelendez Sep 7, 2023
aa89c08
Merge remote-tracking branch 'origin/dependabot/gradle/examples/org.j…
eddumelendez Sep 7, 2023
d24dc80
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
eddumelendez Sep 7, 2023
d5eede2
Merge remote-tracking branch 'origin/dependabot/gradle/modules/hivemq…
eddumelendez Sep 7, 2023
b5b66c0
Merge remote-tracking branch 'origin/dependabot/gradle/modules/junit-…
eddumelendez Sep 7, 2023
63a76d1
Merge remote-tracking branch 'origin/dependabot/gradle/modules/locals…
eddumelendez Sep 7, 2023
64501f3
Merge remote-tracking branch 'origin/dependabot/gradle/core/redis.cli…
eddumelendez Sep 7, 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/ci-docker-wormhole.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
in-docker_test:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build with Gradle
run: |
docker run -i --rm \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-rootless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
test:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup rootless Docker
uses: ScribeMD/rootless-docker@0.2.2
- name: Remove Docket root socket
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
core:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-build
- name: Build and test with Gradle
run: |
Expand All @@ -54,7 +54,7 @@ jobs:
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-build
- name: Setup Testcontainers Cloud Client
uses: atomicjar/testcontainers-cloud-setup-action@main
Expand All @@ -72,7 +72,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-java
- name: Setup Gradle Build Action
uses: gradle/gradle-build-action@v2
Expand All @@ -92,7 +92,7 @@ jobs:
matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-build
- name: Build and test with Gradle (${{matrix.gradle_args}})
run: |
Expand All @@ -104,7 +104,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-java
- name: Setup Gradle Build Action
uses: gradle/gradle-build-action@v2
Expand All @@ -125,7 +125,7 @@ jobs:
matrix: ${{ fromJson(needs.find_examples_jobs.outputs.matrix) }}
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-build
- name: Build and test Examples with Gradle (${{matrix.gradle_args}})
working-directory: ./examples/
Expand All @@ -138,7 +138,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-java
- name: Setup Gradle Build Action
uses: gradle/gradle-build-action@v2
Expand All @@ -158,7 +158,7 @@ jobs:
matrix: ${{ fromJson(needs.find_docs_examples_jobs.outputs.matrix) }}
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-build
- name: Build and test with Gradle (${{matrix.gradle_args}})
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
release:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-java
- name: Clear existing docker image cache
run: docker image prune -af
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-docs-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
if: github.repository == 'testcontainers/testcontainers-java'
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: main
- name: Update latest_version property in mkdocs.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-gradle-wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Update Gradle Wrapper
uses: gradle-update/update-gradle-wrapper-action@0407394b9d173dfc9cf5695f9f560fef6d61a5fe # v1.0.13
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-testcontainers-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
if: github.repository == 'testcontainers/testcontainers-java'
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: main
- name: Update testcontainers.version property in gradle.properties
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ dependencies {

testImplementation 'com.google.cloud.tools:jib-core:0.23.0'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
testImplementation 'redis.clients:jedis:4.4.3'
testImplementation 'redis.clients:jedis:5.0.0'
testImplementation 'com.rabbitmq:amqp-client:5.18.0'
testImplementation 'org.mongodb:mongo-java-driver:3.12.14'

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 @@ -8,7 +8,7 @@ repositories {
dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.36'
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
implementation 'org.json:json:20230227'
implementation 'org.json:json:20230618'
testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
testImplementation 'org.testcontainers:postgresql'
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:4.4.3'
implementation 'redis.clients:jedis:5.0.0'
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:4.4.3'
implementation 'redis.clients:jedis:5.0.0'
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/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:4.4.3'
implementation 'redis.clients:jedis:5.0.0'
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
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.543'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.543'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.545'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.545'
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 @@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
dependencies {
api project(':testcontainers')
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.9.1"
testImplementation "org.elasticsearch.client:transport:7.17.12"
testImplementation "org.elasticsearch.client:transport:7.17.13"
testImplementation 'org.assertj:assertj-core:3.24.2'
}
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.18.0")
testImplementation("com.hivemq:hivemq-extension-sdk:4.19.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/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:4.4.3'
testImplementation 'redis.clients:jedis:5.0.0'
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.543")
testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.545")
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.139'
testImplementation 'software.amazon.awssdk:s3:2.20.142'
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 @@ -7,7 +7,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 "org.gradle.toolchains:foojay-resolver:0.6.0"
classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
}
}

Expand Down
Loading