Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
8a6833d
Bump tomcat-jdbc from 10.0.12 to 10.0.14 in /modules/jdbc
dependabot[bot] Dec 9, 2021
5897437
Bump tomcat-jdbc from 10.0.13 to 10.0.14 in /modules/jdbc-test
dependabot[bot] Jan 1, 2022
e90885e
Bump clickhouse-jdbc from 0.3.1-patch to 0.3.2 in /modules/clickhouse
dependabot[bot] Jan 1, 2022
5c5d4df
Bump jedis from 3.7.0 to 4.0.1 in /modules/junit-jupiter
dependabot[bot] Jan 1, 2022
107bf88
Bump java-client from 3.2.3 to 3.2.4 in /modules/couchbase
dependabot[bot] Jan 1, 2022
d7e28d2
Bump mockito-core from 4.1.0 to 4.2.0 in /core
dependabot[bot] Jan 1, 2022
0592350
Bump aws-java-sdk-dynamodb in /modules/dynalite
dependabot[bot] Jan 1, 2022
97eb8ed
Bump mockito-core from 4.1.0 to 4.2.0 in /modules/junit-jupiter
dependabot[bot] Jan 1, 2022
38ca320
Bump jedis from 3.7.0 to 4.0.1 in /core
dependabot[bot] Jan 1, 2022
7be241b
Bump elasticsearch-rest-client in /modules/elasticsearch
dependabot[bot] Jan 1, 2022
39322a7
Bump snakeyaml from 1.29 to 1.30 in /core
dependabot[bot] Jan 1, 2022
86b3718
Bump s3 from 2.17.72 to 2.17.102 in /modules/localstack
dependabot[bot] Jan 1, 2022
514226a
Bump aws-java-sdk-sqs from 1.12.124 to 1.12.131 in /modules/localstack
dependabot[bot] Jan 1, 2022
fbb031e
Bump aws-java-sdk-s3 from 1.12.122 to 1.12.131 in /modules/localstack
dependabot[bot] Jan 1, 2022
a46d0a4
Bump jedis from 3.0.1 to 4.0.1 in /modules/toxiproxy
dependabot[bot] Jan 1, 2022
3aabcf2
Bump gradle-update/update-gradle-wrapper-action from 1.0.15 to 1.0.16
dependabot[bot] Jan 1, 2022
cf2a23d
Bump solr-solrj from 8.10.1 to 8.11.1 in /examples
dependabot[bot] Jan 1, 2022
132476d
Bump actions/setup-java from 2.4.0 to 2.5.0
dependabot[bot] Jan 1, 2022
f0ddacf
Bump peter-evans/create-pull-request from 3.11.0 to 3.12.0
dependabot[bot] Jan 1, 2022
2c26b68
Bump jedis from 3.7.0 to 4.0.1 in /examples
dependabot[bot] Jan 1, 2022
a3e264a
Bump json from 20210307 to 20211205 in /examples
dependabot[bot] Jan 1, 2022
8374167
Bump org.jetbrains.kotlin.jvm from 1.6.0 to 1.6.10 in /examples
dependabot[bot] Jan 1, 2022
23cbeb3
Fix for API changes in Jedis
kiview Jan 4, 2022
2463af1
Merge remote-tracking branch 'origin/dependabot/gradle/examples/org.j…
kiview Jan 4, 2022
338be90
Merge remote-tracking branch 'origin/dependabot/gradle/examples/org.j…
kiview Jan 4, 2022
374f307
Merge remote-tracking branch 'origin/dependabot/gradle/examples/redis…
kiview Jan 4, 2022
cfe7f80
Merge remote-tracking branch 'origin/dependabot/github_actions/peter-…
kiview Jan 4, 2022
0eae289
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
kiview Jan 4, 2022
6879d74
Merge remote-tracking branch 'origin/dependabot/github_actions/gradle…
kiview Jan 4, 2022
5f0b3c5
Merge remote-tracking branch 'origin/dependabot/gradle/examples/org.a…
kiview Jan 4, 2022
1a144c1
Merge remote-tracking branch 'origin/dependabot/gradle/modules/toxipr…
kiview Jan 4, 2022
652fb3c
Merge remote-tracking branch 'origin/dependabot/gradle/modules/locals…
kiview Jan 4, 2022
6c770fa
Merge remote-tracking branch 'origin/dependabot/gradle/core/org.yaml-…
kiview Jan 4, 2022
128badc
Merge remote-tracking branch 'origin/dependabot/gradle/modules/locals…
kiview Jan 4, 2022
5d87059
Merge remote-tracking branch 'origin/dependabot/gradle/modules/locals…
kiview Jan 4, 2022
52f5aa1
Merge remote-tracking branch 'origin/dependabot/gradle/modules/elasti…
kiview Jan 4, 2022
be2c047
Merge remote-tracking branch 'origin/dependabot/gradle/core/redis.cli…
kiview Jan 4, 2022
4ef276b
Merge remote-tracking branch 'origin/dependabot/gradle/modules/junit-…
kiview Jan 4, 2022
94628b9
Merge remote-tracking branch 'origin/dependabot/gradle/core/org.mocki…
kiview Jan 4, 2022
f9b8d35
Merge remote-tracking branch 'origin/dependabot/gradle/modules/dynali…
kiview Jan 4, 2022
163ee91
Merge remote-tracking branch 'origin/dependabot/gradle/modules/couchb…
kiview Jan 4, 2022
95b56e4
Merge remote-tracking branch 'origin/dependabot/gradle/modules/junit-…
kiview Jan 4, 2022
5f8cd3c
Merge remote-tracking branch 'origin/dependabot/gradle/modules/jdbc-t…
kiview Jan 4, 2022
809ed40
Merge remote-tracking branch 'origin/dependabot/gradle/modules/clickh…
kiview Jan 4, 2022
65808eb
Merge remote-tracking branch 'origin/dependabot/gradle/modules/jdbc/o…
kiview Jan 4, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/ci-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2.4.0
- uses: actions/setup-java@v2.5.0
with:
java-version: '8.0.302'
distribution: temurin
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2.4.0
- uses: actions/setup-java@v2.5.0
with:
java-version: '8.0.302'
distribution: temurin
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2.4.0
- uses: actions/setup-java@v2.5.0
with:
java-version: '8.0.302'
distribution: temurin
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2.4.0
- uses: actions/setup-java@v2.5.0
with:
java-version: '8.0.302'
distribution: temurin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2.4.0
- uses: actions/setup-java@v2.5.0
with:
java-version: '8.0.302'
distribution: temurin
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 @@ -17,7 +17,7 @@ jobs:
sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
git diff
- name: Create Pull Request
uses: peter-evans/create-pull-request@67df31e08a133c6a77008b89689677067fef169e # v3.10.1
uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a # v3.10.1
with:
title: Update docs version to ${GITHUB_REF##*/}
body: |
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 @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v2

- name: Update Gradle Wrapper
uses: gradle-update/update-gradle-wrapper-action@a116d8b533be6c4e71a8b3c3871b7344ca72bf12 # v1.0.13
uses: gradle-update/update-gradle-wrapper-action@f31ab392a9d75029f9fd0883d8d6745c0139a006 # v1.0.13
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
labels: dependencies
Expand Down
6 changes: 3 additions & 3 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,18 @@ dependencies {

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

shaded "org.yaml:snakeyaml:1.29"
shaded "org.yaml:snakeyaml:1.30"

shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'

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

testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
testImplementation 'redis.clients:jedis:3.7.0'
testImplementation 'redis.clients:jedis:4.0.1'
testImplementation 'com.rabbitmq:amqp-client:5.14.0'
testImplementation 'org.mongodb:mongo-java-driver:3.12.10'

testImplementation ('org.mockito:mockito-core:4.1.0') {
testImplementation ('org.mockito:mockito-core:4.2.0') {
exclude(module: 'hamcrest-core')
}
// Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
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.32'
implementation 'com.squareup.okhttp3:okhttp:4.9.3'
implementation 'org.json:json:20210307'
implementation 'org.json:json:20211205'
testImplementation 'org.postgresql:postgresql:42.3.1'
testImplementation 'ch.qos.logback:logback-classic:1.2.7'
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.32'
implementation 'redis.clients:jedis:3.7.0'
implementation 'redis.clients:jedis:4.0.1'
implementation 'com.google.code.gson:gson:2.8.9'
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.32'
implementation 'redis.clients:jedis:3.7.0'
implementation 'redis.clients:jedis:4.0.1'
implementation 'com.google.code.gson:gson:2.8.9'
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:3.7.0'
implementation 'redis.clients:jedis:4.0.1'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'com.google.guava:guava:23.0'
compileOnly 'org.slf4j:slf4j-api:1.7.32'
Expand Down
2 changes: 1 addition & 1 deletion examples/solr-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
compileOnly "org.projectlombok:lombok:1.18.22"
annotationProcessor "org.projectlombok:lombok:1.18.22"

implementation 'org.apache.solr:solr-solrj:8.10.1'
implementation 'org.apache.solr:solr-solrj:8.11.1'

testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.testcontainers:solr'
Expand Down
2 changes: 1 addition & 1 deletion examples/spring-boot-kotlin-redis/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("org.springframework.boot") version "2.6.1"
id("org.jetbrains.kotlin.jvm") version "1.6.0"
id("org.jetbrains.kotlin.jvm") version "1.6.10"
id("org.jetbrains.kotlin.plugin.spring") version "1.6.0"
}

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

testImplementation project(':jdbc-test')
testImplementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.1-patch'
testImplementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.2'
}
2 changes: 1 addition & 1 deletion modules/couchbase/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description = "Testcontainers :: Couchbase"
dependencies {
api project(':testcontainers')

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

compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.122'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.100'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.131'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.131'

testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.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:7.15.2"
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.16.2"
testImplementation "org.elasticsearch.client:transport:7.15.2"
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}
2 changes: 1 addition & 1 deletion modules/jdbc-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
exclude(group: "net.java.dev.jna", module: "jna")
}

api 'org.apache.tomcat:tomcat-jdbc:10.0.13'
api 'org.apache.tomcat:tomcat-jdbc:10.0.14'
api 'org.vibur:vibur-dbcp:25.0'
api 'mysql:mysql-connector-java:8.0.27'
}
2 changes: 1 addition & 1 deletion modules/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
compileOnly 'org.jetbrains:annotations:23.0.0'
testImplementation 'commons-dbutils:commons-dbutils:1.7'
testImplementation 'org.vibur:vibur-dbcp:25.0'
testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.13'
testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.14'
testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
Expand Down
4 changes: 2 additions & 2 deletions modules/junit-jupiter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ dependencies {
testImplementation project(':mysql')
testImplementation project(':postgresql')
testImplementation 'com.zaxxer:HikariCP:4.0.3'
testImplementation 'redis.clients:jedis:3.7.0'
testImplementation 'redis.clients:jedis:4.0.1'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
testImplementation ('org.mockito:mockito-core:4.1.0') {
testImplementation ('org.mockito:mockito-core:4.2.0') {
exclude(module: 'hamcrest-core')
}
testImplementation 'org.assertj:assertj-core:3.21.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ class InheritedTests extends AbstractTestBase {

@Test
void step1() {
assertEquals(1, redisPerClass.getJedis().incr("key").longValue());
assertEquals(1, redisPerTest.getJedis().incr("key").longValue());
assertEquals(1, myRedis.getJedis().incr("key").longValue());
assertEquals(1, redisPerClass.getJedis().incr("key"));
assertEquals(1, redisPerTest.getJedis().incr("key"));
assertEquals(1, myRedis.getJedis().incr("key"));
}

@Test
void step2() {
assertEquals(2, redisPerClass.getJedis().incr("key").longValue());
assertEquals(1, redisPerTest.getJedis().incr("key").longValue());
assertEquals(1, myRedis.getJedis().incr("key").longValue());
assertEquals(2, redisPerClass.getJedis().incr("key"));
assertEquals(1, redisPerTest.getJedis().incr("key"));
assertEquals(1, myRedis.getJedis().incr("key"));
}
}
6 changes: 3 additions & 3 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')

compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.122'
compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.131'
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.122'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.124'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.131'
testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.122'
testImplementation 'software.amazon.awssdk:s3:2.17.72'
testImplementation 'software.amazon.awssdk:s3:2.17.102'
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}
2 changes: 1 addition & 1 deletion modules/toxiproxy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies {
api project(':testcontainers')
api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.5'

testImplementation 'redis.clients:jedis:3.0.1'
testImplementation 'redis.clients:jedis:4.0.1'
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

testImplementation project(':test-support')
Expand Down