From 38a443f098c3407a65330bc38ae016cbe4bae8e1 Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Thu, 29 Jul 2021 16:56:49 +0200 Subject: [PATCH 01/24] Update RELEASING.md (#4295) Update the docs to reflect our current release process. --- RELEASING.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index aaba172d20e..34a6b55ae26 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -1,19 +1,23 @@ # Release process -Testcontainers' release process is automated as a Travis deployment. This describes the basic steps for a project member to perform a release. +Testcontainers' release process is semi-automated through GitHub Actions. This describes the basic steps for a project member to perform a release. ## Steps 1. Ensure that the master branch is building and that tests are passing. -1. Ensure that the [`CHANGELOG`](CHANGELOG.md) file is up to date and includes all merged features. 1. Create a new release on GitHub. **The tag name is used as the version**, so please keep the tag name plain (e.g. 1.2.3). -1. Check that the Travis build passed. -1. Release of published artifacts to Bintray is fully automated. -1. After successful publication to Bintray, the artifacts must be synced to Maven Central. +1. The release triggers a GitHub Action workflow, but it gets mostly build using results from the Gradle remote-cache. Therefore, this should be fairly fast. +1. Login to Sonatype to check the staging repository. +1. Get the staging url after GitHub Action workflow finished. +1. Manually test the release with the staging url as maven repository url (e.g. critical issues and features). +1. Run [TinSalver](https://github.com/bsideup/tinsalver) from GitHub using `npx` to sign artifact (see [TinsSalver README](https://github.com/bsideup/tinsalver/blob/main/README.md)). +1. Close the release in Sonatype. This will evaluate the release based on given Sontaype rules and afterwards automatically sync to Maven Central. +1. Handcraft and polish some of the release notes (e.g. substitute combinded dependency PRs and highlight certain features). 1. When available through Maven Central, poke [Richard North](https://github.com/rnorth) to announce the release on Twitter! ## Internal details -* The process is done with Gradle and Bintray. -* Bintray will automatically promote the release to Maven Central. -* Travis secrets hold Bintray username/passwords that are used for publishing. +* The process is done with GitHub Actions, TinSalver and Sonatype. +* Sonatype will automatically promote the staging release to Maven Central. +* Keybase needs to be installed on the developer machine. +* GPG key of signing developer needs to be uplodaed to the Ubuntu keyserver (or other server supported by Sonatype). From 520cfeb5345f4230a1611b9b1c7708c2b1d8353e Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Fri, 30 Jul 2021 23:08:49 +0200 Subject: [PATCH 02/24] Disable Chrome's GPU support in `BrowserWebDriverContainer` (#4315) * Trigger selenium build on CI * Try again to trigger build * Apply potential fix by disabling GPU * Also --disable-dev-shm-usage * Alwas add disable-gpu flag * Smaller check for hack * Smaller check for hack --- .../containers/BrowserWebDriverContainer.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java index 4a25ae486cd..1209b7af019 100644 --- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java +++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java @@ -166,6 +166,13 @@ protected void configure() { } } + // Hack for new selenium-chrome image that contains Chrome 92. + // If not disabled, container startup will fail in most cases and consume excessive amounts of CPU. + if (capabilities instanceof ChromeOptions) { + ChromeOptions options = (ChromeOptions) this.capabilities; + options.addArguments("--disable-gpu"); + } + if (recordingMode != VncRecordingMode.SKIP) { if (vncRecordingDirectory == null) { From 4df9b900e79e4a3033ef0975abacf9064a0e7353 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 30 Jul 2021 23:56:49 +0200 Subject: [PATCH 03/24] Update Kafka config dynamically (#4316) * Update Kafka config dynamically * Simplify further, fix the Kafka Cluster example --- .../containers/GenericContainer.java | 2 +- .../containers/KafkaContainer.java | 106 ++++++------------ 2 files changed, 37 insertions(+), 71 deletions(-) diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java index 56ca5345ecd..50e4b927617 100644 --- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java +++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java @@ -135,7 +135,7 @@ public class GenericContainer> @NonNull private String networkMode; - @NonNull + @Nullable private Network network; @NonNull diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java index d9c8e35e852..f62ca23eb57 100644 --- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java +++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java @@ -2,12 +2,8 @@ import com.github.dockerjava.api.command.InspectContainerResponse; import lombok.SneakyThrows; -import org.testcontainers.images.builder.Transferable; import org.testcontainers.utility.DockerImageName; -import java.nio.charset.StandardCharsets; -import java.util.Comparator; - /** * This container wraps Confluent Kafka and Zookeeper (optionally) * @@ -17,20 +13,14 @@ public class KafkaContainer extends GenericContainer { private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-kafka"); private static final String DEFAULT_TAG = "5.4.3"; - private static final String STARTER_SCRIPT = "/testcontainers_start.sh"; - public static final int KAFKA_PORT = 9093; public static final int ZOOKEEPER_PORT = 2181; private static final String DEFAULT_INTERNAL_TOPIC_RF = "1"; - private static final int PORT_NOT_ASSIGNED = -1; - protected String externalZookeeperConnect = null; - private int port = PORT_NOT_ASSIGNED; - /** * @deprecated use {@link KafkaContainer(DockerImageName)} instead */ @@ -80,83 +70,59 @@ public KafkaContainer withExternalZookeeper(String connectString) { } public String getBootstrapServers() { - if (port == PORT_NOT_ASSIGNED) { - throw new IllegalStateException("You should start Kafka container first"); - } - return String.format("PLAINTEXT://%s:%s", getHost(), port); - } - - @Override - protected void doStart() { - withCommand("sh", "-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT); - - if (externalZookeeperConnect == null) { - addExposedPort(ZOOKEEPER_PORT); - } - - super.doStart(); + return String.format("PLAINTEXT://%s:%s", getHost(), getMappedPort(KAFKA_PORT)); } @Override - @SneakyThrows - protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) { - super.containerIsStarting(containerInfo, reused); - - port = getMappedPort(KAFKA_PORT); - - if (reused) { - return; - } + protected void configure() { + withEnv( + "KAFKA_ADVERTISED_LISTENERS", + String.format( + "BROKER://%s:9092", + getNetwork() != null + ? getNetworkAliases().get(0) + : "localhost" + ) + ); String command = "#!/bin/bash\n"; - final String zookeeperConnect; if (externalZookeeperConnect != null) { - zookeeperConnect = externalZookeeperConnect; + withEnv("KAFKA_ZOOKEEPER_CONNECT", externalZookeeperConnect); } else { - zookeeperConnect = "localhost:" + ZOOKEEPER_PORT; + addExposedPort(ZOOKEEPER_PORT); + withEnv("KAFKA_ZOOKEEPER_CONNECT", "localhost:" + ZOOKEEPER_PORT); command += "echo 'clientPort=" + ZOOKEEPER_PORT + "' > zookeeper.properties\n"; command += "echo 'dataDir=/var/lib/zookeeper/data' >> zookeeper.properties\n"; command += "echo 'dataLogDir=/var/lib/zookeeper/log' >> zookeeper.properties\n"; command += "zookeeper-server-start zookeeper.properties &\n"; } - command += "export KAFKA_ZOOKEEPER_CONNECT='" + zookeeperConnect + "'\n"; - - command += "export KAFKA_ADVERTISED_LISTENERS='" + String.join(",", getBootstrapServers(), brokerAdvertisedListener(containerInfo)) + "'\n"; - - command += ". /etc/confluent/docker/bash-config \n"; - command += "/etc/confluent/docker/configure \n"; - command += "/etc/confluent/docker/launch \n"; + // Optimization: skip the checks + command += "echo '' > /etc/confluent/docker/ensure \n"; + // Run the original command + command += "/etc/confluent/docker/run \n"; + withCommand("sh", "-c", command); + } - copyFileToContainer( - Transferable.of(command.getBytes(StandardCharsets.UTF_8), 0777), - STARTER_SCRIPT + @Override + @SneakyThrows + protected void containerIsStarted(InspectContainerResponse containerInfo) { + String brokerAdvertisedListener = brokerAdvertisedListener(containerInfo); + ExecResult result = execInContainer( + "kafka-configs", + "--alter", + "--bootstrap-server", brokerAdvertisedListener, + "--entity-type", "brokers", + "--entity-name", getEnvMap().get("KAFKA_BROKER_ID"), + "--add-config", + "advertised.listeners=[" + String.join(",", getBootstrapServers(), brokerAdvertisedListener) + "]" ); + if (result.getExitCode() != 0) { + throw new IllegalStateException(result.getStderr()); + } } protected String brokerAdvertisedListener(InspectContainerResponse containerInfo) { - // Kafka supports only one INTER_BROKER listener, so we have to pick one. - // The current algorithm uses the following order of resolving the IP: - // 1. Custom network's IP set via `withNetwork` - // 2. Bridge network's IP - // 3. Best effort fallback to getNetworkSettings#ipAddress - String ipAddress = containerInfo.getNetworkSettings().getNetworks().entrySet() - .stream() - .filter(it -> it.getValue().getIpAddress() != null) - .max(Comparator.comparingInt(entry -> { - if (getNetwork() != null && getNetwork().getId().equals(entry.getValue().getNetworkID())) { - return 2; - } - - if ("bridge".equals(entry.getKey())) { - return 1; - } - - return 0; - })) - .map(it -> it.getValue().getIpAddress()) - .orElseGet(() -> containerInfo.getNetworkSettings().getIpAddress()); - - return String.format("BROKER://%s:%s", ipAddress, "9092"); + return String.format("BROKER://%s:%s", containerInfo.getConfig().getHostName(), "9092"); } } From 6d257e682ad01f87645317c21c851fb8db952ff1 Mon Sep 17 00:00:00 2001 From: Martin Gjaldbaek Date: Sun, 1 Aug 2021 07:44:33 +0200 Subject: [PATCH 04/24] Fix potential injection vulnerability (#4314) See https://github.com/hrvey/combine-prs-workflow/releases/tag/1.2.0 --- .github/workflows/combine-prs.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml index e1d96a20895..2e8177458a0 100644 --- a/.github/workflows/combine-prs.yml +++ b/.github/workflows/combine-prs.yml @@ -105,7 +105,7 @@ jobs: BRANCHES_TO_COMBINE: ${{ steps.fetch-branch-names.outputs.result }} COMBINE_BRANCH_NAME: ${{ github.event.inputs.combineBranchName }} run: | - echo "${{steps.fetch-branch-names.outputs.result}}" + echo "$BRANCHES_TO_COMBINE" sourcebranches="${BRANCHES_TO_COMBINE%\"}" sourcebranches="${sourcebranches#\"}" @@ -123,10 +123,12 @@ jobs: # Creates a PR with the new combined branch - uses: actions/github-script@v4.0.2 name: Create Combined Pull Request + env: + PRS_STRING: ${{ steps.fetch-branch-names.outputs.prs-string }} with: github-token: ${{secrets.GITHUB_TOKEN}} script: | - const prString = `${{ steps.fetch-branch-names.outputs.prs-string }}`; + const prString = process.env.PRS_STRING; const body = 'This PR was created by the Combine PRs action by combining the following PRs:\n' + prString; await github.pulls.create({ owner: context.repo.owner, From 289521d84555b7680af3edb15a623a210cf08def Mon Sep 17 00:00:00 2001 From: Richard North Date: Sun, 1 Aug 2021 06:46:26 +0100 Subject: [PATCH 05/24] Delete combine-prs.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removing because we’re now using an external script based on `gh` Which works pretty well for us. --- .github/workflows/combine-prs.yml | 140 ------------------------------ 1 file changed, 140 deletions(-) delete mode 100644 .github/workflows/combine-prs.yml diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml deleted file mode 100644 index 2e8177458a0..00000000000 --- a/.github/workflows/combine-prs.yml +++ /dev/null @@ -1,140 +0,0 @@ -name: 'Combine PRs' - -# Controls when the action will run - in this case triggered manually -on: - workflow_dispatch: - inputs: - branchPrefix: - description: 'Branch prefix to find combinable PRs based on' - required: true - default: 'dependabot' - mustBeGreen: - description: 'Only combine PRs that are green (status is success)' - required: true - default: 'true' - combineBranchName: - description: 'Name of the branch to combine PRs into' - required: true - default: 'combine-prs-branch' - ignoreLabel: - description: 'Exclude PRs with this label' - required: true - default: 'nocombine' - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "combine-prs" - combine-prs: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - - uses: actions/github-script@v4.0.2 - id: fetch-branch-names - name: Fetch branch names - with: - github-token: ${{secrets.GITHUB_TOKEN}} - script: | - const pulls = await github.paginate('GET /repos/:owner/:repo/pulls', { - owner: context.repo.owner, - repo: context.repo.repo - }); - branches = []; - prs = []; - base_branch = null; - for (const pull of pulls) { - const branch = pull['head']['ref']; - console.log('Pull for branch: ' + branch); - if (branch.startsWith('${{ github.event.inputs.branchPrefix }}')) { - console.log('Branch matched: ' + branch); - statusOK = true; - if(${{ github.event.inputs.mustBeGreen }}) { - console.log('Checking green status: ' + branch); - const checkRuns = await github.request('GET /repos/{owner}/{repo}/commits/{ref}/check-runs', { - owner: context.repo.owner, - repo: context.repo.repo, - ref: branch - }); - for await (const cr of checkRuns.data.check_runs) { - console.log('Validating check conclusion: ' + cr.conclusion); - if(cr.conclusion != 'success') { - console.log('Discarding ' + branch + ' with check conclusion ' + cr.conclusion); - statusOK = false; - } - } - } - console.log('Checking labels: ' + branch); - const labels = pull['labels']; - for(const label of labels) { - const labelName = label['name']; - console.log('Checking label: ' + labelName); - if(labelName == '${{ github.event.inputs.ignoreLabel }}') { - console.log('Discarding ' + branch + ' with label ' + labelName); - statusOK = false; - } - } - if (statusOK) { - console.log('Adding branch to array: ' + branch); - branches.push(branch); - prs.push('#' + pull['number'] + ' ' + pull['title']); - base_branch = pull['base']['ref']; - } - } - } - - if (branches.length == 0) { - core.setFailed('No PRs/branches matched criteria'); - return; - } - - core.setOutput('base-branch', base_branch); - core.setOutput('prs-string', prs.join('\n')); - - combined = branches.join(' ') - console.log('Combined: ' + combined); - return combined - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2.3.3 - with: - fetch-depth: 0 - # Creates a branch with other PR branches merged together - - name: Created combined branch - env: - BASE_BRANCH: ${{ steps.fetch-branch-names.outputs.base-branch }} - BRANCHES_TO_COMBINE: ${{ steps.fetch-branch-names.outputs.result }} - COMBINE_BRANCH_NAME: ${{ github.event.inputs.combineBranchName }} - run: | - echo "$BRANCHES_TO_COMBINE" - sourcebranches="${BRANCHES_TO_COMBINE%\"}" - sourcebranches="${sourcebranches#\"}" - - basebranch="${BASE_BRANCH%\"}" - basebranch="${basebranch#\"}" - - git config pull.rebase false - git config user.name github-actions - git config user.email github-actions@github.com - - git branch $COMBINE_BRANCH_NAME $basebranch - git checkout $COMBINE_BRANCH_NAME - git pull origin $sourcebranches --no-edit - git push origin $COMBINE_BRANCH_NAME - # Creates a PR with the new combined branch - - uses: actions/github-script@v4.0.2 - name: Create Combined Pull Request - env: - PRS_STRING: ${{ steps.fetch-branch-names.outputs.prs-string }} - with: - github-token: ${{secrets.GITHUB_TOKEN}} - script: | - const prString = process.env.PRS_STRING; - const body = 'This PR was created by the Combine PRs action by combining the following PRs:\n' + prString; - await github.pulls.create({ - owner: context.repo.owner, - repo: context.repo.repo, - title: 'Combined PR', - head: '${{ github.event.inputs.combineBranchName }}', - base: '${{ steps.fetch-branch-names.outputs.base-branch }}', - body: body - }); From 676845417c88ac136fd5df323e788f16beec817f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:35 +0000 Subject: [PATCH 06/24] Bump mysql-connector-java from 8.0.25 to 8.0.26 in /modules/jdbc-test Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.25 to 8.0.26. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.25...8.0.26) --- updated-dependencies: - dependency-name: mysql:mysql-connector-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/jdbc-test/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle index 99cba7dcb70..17c44383f74 100644 --- a/modules/jdbc-test/build.gradle +++ b/modules/jdbc-test/build.gradle @@ -16,5 +16,5 @@ dependencies { api 'org.apache.tomcat:tomcat-jdbc:10.0.7' api 'org.vibur:vibur-dbcp:25.0' - api 'mysql:mysql-connector-java:8.0.25' + api 'mysql:mysql-connector-java:8.0.26' } From d5d91b5d80efa0d95ee5e0b52fd028951e539615 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:36 +0000 Subject: [PATCH 07/24] Bump java-client from 3.1.6 to 3.2.0 in /modules/couchbase Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.1.6 to 3.2.0. - [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases) - [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.1.6...java-client-3.2.0) --- updated-dependencies: - dependency-name: com.couchbase.client:java-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- modules/couchbase/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle index 40f59128ec8..823b88a983e 100644 --- a/modules/couchbase/build.gradle +++ b/modules/couchbase/build.gradle @@ -3,6 +3,6 @@ description = "Testcontainers :: Couchbase" dependencies { api project(':testcontainers') - testImplementation 'com.couchbase.client:java-client:3.1.6' + testImplementation 'com.couchbase.client:java-client:3.2.0' testImplementation 'org.awaitility:awaitility:4.1.0' } From 42a4fddccf1de98a7b7d1b4b98f4e9a0f5a40100 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:37 +0000 Subject: [PATCH 08/24] Bump slf4j-api from 1.7.30 to 1.7.32 in /core Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.30 to 1.7.32. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.30...v_1.7.32) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index d7ccb9364f8..29c521a97e8 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -100,7 +100,7 @@ dependencies { } api 'junit:junit:4.12' - api 'org.slf4j:slf4j-api:1.7.30' + api 'org.slf4j:slf4j-api:1.7.32' compileOnly 'org.jetbrains:annotations:21.0.1' testCompileClasspath 'org.jetbrains:annotations:21.0.1' api 'org.apache.commons:commons-compress:1.20' From 41e7cede1a4bee67c1d72504168c2579b5e46d84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:37 +0000 Subject: [PATCH 09/24] Bump postgresql from 42.2.22 to 42.2.23 in /modules/postgresql Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.22 to 42.2.23. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.23/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.22...REL42.2.23) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/postgresql/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle index 9b7063e3a0c..410706429d5 100644 --- a/modules/postgresql/build.gradle +++ b/modules/postgresql/build.gradle @@ -11,7 +11,7 @@ dependencies { testImplementation project(':jdbc-test') testImplementation project(':test-support') - testImplementation 'org.postgresql:postgresql:42.2.22' + testImplementation 'org.postgresql:postgresql:42.2.23' testImplementation testFixtures(project(':r2dbc')) testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE' From a622e0d06c3dbcf3086ecc4f21963f07362f6f2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:37 +0000 Subject: [PATCH 10/24] Bump mysql-connector-java in /modules/junit-jupiter Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.25 to 8.0.26. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.25...8.0.26) --- updated-dependencies: - dependency-name: mysql:mysql-connector-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/junit-jupiter/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle index 9554f2c9e5b..2722f659bdd 100644 --- a/modules/junit-jupiter/build.gradle +++ b/modules/junit-jupiter/build.gradle @@ -16,7 +16,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2' testRuntimeOnly 'org.postgresql:postgresql:42.2.22' - testRuntimeOnly 'mysql:mysql-connector-java:8.0.25' + testRuntimeOnly 'mysql:mysql-connector-java:8.0.26' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2' } From 2ef95ba8d7c1f171d9d4eefbdc639c91ceaddc65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:42 +0000 Subject: [PATCH 11/24] Bump jedis from 3.6.1 to 3.6.3 in /modules/junit-jupiter Bumps [jedis](https://github.com/redis/jedis) from 3.6.1 to 3.6.3. - [Release notes](https://github.com/redis/jedis/releases) - [Commits](https://github.com/redis/jedis/compare/jedis-3.6.1...v3.6.3) --- updated-dependencies: - dependency-name: redis.clients:jedis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/junit-jupiter/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle index 9554f2c9e5b..e48d28a5e5e 100644 --- a/modules/junit-jupiter/build.gradle +++ b/modules/junit-jupiter/build.gradle @@ -7,7 +7,7 @@ dependencies { testImplementation project(':mysql') testImplementation project(':postgresql') testImplementation 'com.zaxxer:HikariCP:4.0.3' - testImplementation 'redis.clients:jedis:3.6.1' + testImplementation 'redis.clients:jedis:3.6.3' testImplementation 'org.apache.httpcomponents:httpclient:4.5.13' testImplementation ('org.mockito:mockito-core:3.11.2') { exclude(module: 'hamcrest-core') From 1f84c2af02453e841297b306d61e3e234c9f102a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:43 +0000 Subject: [PATCH 12/24] Bump mysql-connector-java from 8.0.25 to 8.0.26 in /modules/mysql Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.25 to 8.0.26. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.25...8.0.26) --- updated-dependencies: - dependency-name: mysql:mysql-connector-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/mysql/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle index a14fa678280..db2deac2d10 100644 --- a/modules/mysql/build.gradle +++ b/modules/mysql/build.gradle @@ -10,7 +10,7 @@ dependencies { compileOnly 'dev.miku:r2dbc-mysql:0.8.2.RELEASE' testImplementation project(':jdbc-test') - testImplementation 'mysql:mysql-connector-java:8.0.25' + testImplementation 'mysql:mysql-connector-java:8.0.26' testImplementation testFixtures(project(':r2dbc')) testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE' From 695c77f73e56406d55aeb18800fcf73f0901c858 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:43 +0000 Subject: [PATCH 13/24] Bump mongo-java-driver from 3.12.7 to 3.12.9 in /core Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.12.7 to 3.12.9. - [Release notes](https://github.com/mongodb/mongo-java-driver/releases) - [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.12.7...r3.12.9) --- updated-dependencies: - dependency-name: org.mongodb:mongo-java-driver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index d7ccb9364f8..2677486fa58 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -140,7 +140,7 @@ dependencies { testImplementation 'org.apache.httpcomponents:httpclient:4.5.9' testImplementation 'redis.clients:jedis:3.6.1' testImplementation 'com.rabbitmq:amqp-client:5.12.0' - testImplementation 'org.mongodb:mongo-java-driver:3.12.7' + testImplementation 'org.mongodb:mongo-java-driver:3.12.9' testImplementation ('org.mockito:mockito-core:3.11.2') { exclude(module: 'hamcrest-core') From ab2ede992f69dab8379177832a4fe95b330db930 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:44 +0000 Subject: [PATCH 14/24] Bump HikariCP from 4.0.3 to 5.0.0 in /modules/spock Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 4.0.3 to 5.0.0. - [Release notes](https://github.com/brettwooldridge/HikariCP/releases) - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-4.0.3...HikariCP-5.0.0) --- updated-dependencies: - dependency-name: com.zaxxer:HikariCP dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- modules/spock/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle index 6ee936b7ca7..56f35ffe695 100644 --- a/modules/spock/build.gradle +++ b/modules/spock/build.gradle @@ -12,7 +12,7 @@ dependencies { testImplementation project(':mysql') testImplementation project(':postgresql') - testImplementation 'com.zaxxer:HikariCP:4.0.3' + testImplementation 'com.zaxxer:HikariCP:5.0.0' testImplementation 'org.apache.httpcomponents:httpclient:4.5.13' testRuntimeOnly 'org.postgresql:postgresql:42.2.22' From d8737a9154b35ed3981803ac81a3f3ded6e16631 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:48 +0000 Subject: [PATCH 15/24] Bump transport from 7.13.2 to 7.13.4 in /modules/elasticsearch Bumps [transport](https://github.com/elastic/elasticsearch) from 7.13.2 to 7.13.4. - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.13.2...v7.13.4) --- updated-dependencies: - dependency-name: org.elasticsearch.client:transport dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/elasticsearch/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle index 67e03df2945..180f373bddd 100644 --- a/modules/elasticsearch/build.gradle +++ b/modules/elasticsearch/build.gradle @@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch" dependencies { api project(':testcontainers') testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.13.0" - testImplementation "org.elasticsearch.client:transport:7.13.2" + testImplementation "org.elasticsearch.client:transport:7.13.4" testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2' } From 2e53d6deba8df7aba18502bc86b56f0ba510200f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:48 +0000 Subject: [PATCH 16/24] Bump aws-java-sdk-s3 from 1.12.16 to 1.12.37 in /modules/localstack Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.16 to 1.12.37. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.16...1.12.37) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-s3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/localstack/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle index 031a601bdc9..5158325fa92 100644 --- a/modules/localstack/build.gradle +++ b/modules/localstack/build.gradle @@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack" dependencies { api project(':testcontainers') - compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.16' - testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030' + compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.37' + testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.37' testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.19' testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.16' testImplementation 'software.amazon.awssdk:s3:2.16.97' From f8ff174917c480019cf2bd361eab01d33397d974 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:52 +0000 Subject: [PATCH 17/24] Bump slf4j-api from 1.7.30 to 1.7.32 in /examples Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.30 to 1.7.32. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.30...v_1.7.32) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- examples/linked-container/build.gradle | 2 +- examples/redis-backed-cache-testng/build.gradle | 2 +- examples/redis-backed-cache/build.gradle | 2 +- examples/singleton-container/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle index c5706da277a..6ca8b1ae664 100644 --- a/examples/linked-container/build.gradle +++ b/examples/linked-container/build.gradle @@ -6,7 +6,7 @@ repositories { jcenter() } dependencies { - compileOnly 'org.slf4j:slf4j-api:1.7.30' + compileOnly 'org.slf4j:slf4j-api:1.7.32' implementation 'com.squareup.okhttp3:okhttp:4.9.1' implementation 'org.json:json:20210307' testImplementation 'org.postgresql:postgresql:42.2.22' diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle index 58f31827717..56dab9c4951 100644 --- a/examples/redis-backed-cache-testng/build.gradle +++ b/examples/redis-backed-cache-testng/build.gradle @@ -7,7 +7,7 @@ repositories { } dependencies { - compileOnly 'org.slf4j:slf4j-api:1.7.30' + compileOnly 'org.slf4j:slf4j-api:1.7.32' implementation 'redis.clients:jedis:3.6.1' implementation 'com.google.code.gson:gson:2.8.7' implementation 'com.google.guava:guava:23.0' diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle index 4fb93cb71b5..771f55551ea 100644 --- a/examples/redis-backed-cache/build.gradle +++ b/examples/redis-backed-cache/build.gradle @@ -7,7 +7,7 @@ repositories { } dependencies { - compileOnly 'org.slf4j:slf4j-api:1.7.30' + compileOnly 'org.slf4j:slf4j-api:1.7.32' implementation 'redis.clients:jedis:3.6.1' implementation 'com.google.code.gson:gson:2.8.7' implementation 'com.google.guava:guava:23.0' diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle index e803f616998..a806f483938 100644 --- a/examples/singleton-container/build.gradle +++ b/examples/singleton-container/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation 'redis.clients:jedis:3.6.1' implementation 'com.google.code.gson:gson:2.8.7' implementation 'com.google.guava:guava:23.0' - compileOnly 'org.slf4j:slf4j-api:1.7.30' + compileOnly 'org.slf4j:slf4j-api:1.7.32' testImplementation 'ch.qos.logback:logback-classic:1.2.3' testImplementation 'org.testcontainers:testcontainers' From 3063021a6bc1d6739611339c0cfb0234ce78554d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:54 +0000 Subject: [PATCH 18/24] Bump postgresql from 42.2.22 to 42.2.23 in /modules/spock Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.22 to 42.2.23. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.23/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.22...REL42.2.23) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/spock/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle index 6ee936b7ca7..7720067b620 100644 --- a/modules/spock/build.gradle +++ b/modules/spock/build.gradle @@ -15,7 +15,7 @@ dependencies { testImplementation 'com.zaxxer:HikariCP:4.0.3' testImplementation 'org.apache.httpcomponents:httpclient:4.5.13' - testRuntimeOnly 'org.postgresql:postgresql:42.2.22' + testRuntimeOnly 'org.postgresql:postgresql:42.2.23' testRuntimeOnly 'mysql:mysql-connector-java:8.0.25' testCompileClasspath 'org.jetbrains:annotations:21.0.1' From e2cb908c5f67180d4ee7ba5bd39ab44fcc5a3cc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:55 +0000 Subject: [PATCH 19/24] Bump testcontainers from 1.15.3 to 1.16.0 in /core Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.15.3 to 1.16.0. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.15.3...1.16.0) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index d7ccb9364f8..3ea1a33a7e3 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -95,7 +95,7 @@ configurations.all { } dependencies { - baseline 'org.testcontainers:testcontainers:1.15.3', { + baseline 'org.testcontainers:testcontainers:1.16.0', { exclude group: "*", module: "*" } From a6f300c4bb1ec0af91f722a14701c68a11c504a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:00:57 +0000 Subject: [PATCH 20/24] Bump aws-java-sdk-logs from 1.12.16 to 1.12.37 in /modules/localstack Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.16 to 1.12.37. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.16...1.12.37) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-logs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/localstack/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle index 031a601bdc9..21652d15fa6 100644 --- a/modules/localstack/build.gradle +++ b/modules/localstack/build.gradle @@ -6,7 +6,7 @@ dependencies { compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.16' testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030' testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.19' - testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.16' + testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.37' testImplementation 'software.amazon.awssdk:s3:2.16.97' testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2' } From f5f0dc65f5b872c60cccfc20911a39b89e39b03a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:01:01 +0000 Subject: [PATCH 21/24] Bump jedis from 3.6.1 to 3.6.3 in /core Bumps [jedis](https://github.com/redis/jedis) from 3.6.1 to 3.6.3. - [Release notes](https://github.com/redis/jedis/releases) - [Commits](https://github.com/redis/jedis/compare/jedis-3.6.1...v3.6.3) --- updated-dependencies: - dependency-name: redis.clients:jedis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index d7ccb9364f8..8b4abdb11c4 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -138,7 +138,7 @@ dependencies { } testImplementation 'org.apache.httpcomponents:httpclient:4.5.9' - testImplementation 'redis.clients:jedis:3.6.1' + testImplementation 'redis.clients:jedis:3.6.3' testImplementation 'com.rabbitmq:amqp-client:5.12.0' testImplementation 'org.mongodb:mongo-java-driver:3.12.7' From 381fa285b6f296c76fb2d7a533a5666bec8db91d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:01:07 +0000 Subject: [PATCH 22/24] Bump postgresql from 42.2.22 to 42.2.23 in /examples Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.22 to 42.2.23. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.23/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.22...REL42.2.23) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- examples/linked-container/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle index c5706da277a..2bb27ae83cf 100644 --- a/examples/linked-container/build.gradle +++ b/examples/linked-container/build.gradle @@ -9,7 +9,7 @@ dependencies { compileOnly 'org.slf4j:slf4j-api:1.7.30' implementation 'com.squareup.okhttp3:okhttp:4.9.1' implementation 'org.json:json:20210307' - testImplementation 'org.postgresql:postgresql:42.2.22' + testImplementation 'org.postgresql:postgresql:42.2.23' testImplementation 'ch.qos.logback:logback-classic:1.2.3' testImplementation 'org.testcontainers:postgresql' } From b3f10668ec911d55dd16a2b420f13301affc8a60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:01:09 +0000 Subject: [PATCH 23/24] Bump org.jetbrains.kotlin.plugin.spring in /examples Bumps org.jetbrains.kotlin.plugin.spring from 1.5.20 to 1.5.21. --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.plugin.spring dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- examples/spring-boot-kotlin-redis/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle index 7e832956303..db7e4ebe957 100644 --- a/examples/spring-boot-kotlin-redis/build.gradle +++ b/examples/spring-boot-kotlin-redis/build.gradle @@ -1,7 +1,7 @@ plugins { id("org.springframework.boot") version "2.5.2" id("org.jetbrains.kotlin.jvm") version "1.5.10" - id("org.jetbrains.kotlin.plugin.spring") version "1.5.20" + id("org.jetbrains.kotlin.plugin.spring") version "1.5.21" } apply plugin: 'io.spring.dependency-management' From b5331f48342521b7c0b1f27135b275835a04c44d Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Mon, 2 Aug 2021 12:27:52 +0200 Subject: [PATCH 24/24] Fix failing `PublicBinaryAPITest` for `DynamicPollInterval` (#4353) Also change `jarFileTest` to take the shadowJar into consideration as input for the cache key. --- core/build.gradle | 1 + .../jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/core/build.gradle b/core/build.gradle index ca1fde00aae..824c1bb0c4e 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -50,6 +50,7 @@ task jarFileTest(type: Test) { testClassesDirs = sourceSets.jarFileTest.output.classesDirs classpath = sourceSets.jarFileTest.runtimeClasspath + file(shadowJar.outputs.files.singleFile) // input for correct caching systemProperty("jarFile", shadowJar.outputs.files.singleFile) dependsOn(shadowJar) diff --git a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java index 6a5a766d24e..208c8702654 100644 --- a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java +++ b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java @@ -93,6 +93,7 @@ public void setUp() { case "org/testcontainers/dockerclient/UnixSocketClientProviderStrategy": case "org/testcontainers/dockerclient/DockerClientProviderStrategy": case "org/testcontainers/dockerclient/WindowsClientProviderStrategy": + case "org/testcontainers/utility/DynamicPollInterval": Assume.assumeTrue(false); } }