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.

Sign up for GitHub

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

Jump to bottom

Extends dynalite container from GenericContainer - for JUnit5 support #1114

Merged
merged 1 commit into from Jan 9, 2019
Merged

Extends dynalite container from GenericContainer - for JUnit5 support #1114

merged 1 commit into from Jan 9, 2019

Conversation

bijukunjummen
Copy link
Contributor

Fixes an issue where dynalite containers don't work with JUnit5 @TestContainers annotation. The issue is that the containers are expected to be Startable which it is not today.

The change makes DynaliteContainer derive from GenericContainer instead of ExternalResource

kiview pushed a commit to tolkonepiu/testcontainers-java that referenced this pull request Jan 8, 2019
@dependabot @rnorth
Bump HikariCP from 2.6.1 to 3.2.0 in /modules/spock (testcontainers#1053
ade7f6d 
)

Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 2.6.1 to 3.2.0.
<details>
<summary>Changelog</summary>

*Sourced from [HikariCP's changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES).*

> HikariCP Changes
> 
> Changes in 3.2.0
> 
>  * check connection closed condition before attempting to set network timeout to avoid spurios exceptions
>    in the log.
> 
>  * updated validation failure message to include recommendation to check maxLifetime value.
> 
>  * fixed 1141 do not throw SQLException when calling isClosed() or close() on a already closed unwrapped
>    Connection, as per JDBC specification.
> 
>  * fixed 1137 support changing user/password at runtime for DriverDataSource-wrapped driver connections.
> 
>  * fixed 1136 log loaded driver when using jdbcUrl.
> 
>  * pull 1135 extract sealed pool check into independent method.
> 
>  * fixed 1126 correct error in JavaDoc for HikariConfig.setInitializationFailTimeout().
> 
>  * fixed 1114 removed unreachable code.
> 
> Changes in 3.1.0
> 
>  * Add get/setCatalog() to HikariConfigMXBean, allowing the catalog to be changed at runtime.
>    The catalog should only be changed while the pool is suspended, and after evicting existing
>    connections via HikariPoolMXBean.softEvictConnections().
> 
> Changes in 3.0.0
> 
>  * Removed previously deprecated methods;
>      HikariConfig.copyState()
>      HikariConfig.getScheduledExecutorService()
>      HikariConfig.setScheduledExecutorService()
>      HikariConfig.isInitializationFailFast()
>      HikariConfig.setInitializationFailFast()
>      HikariConfig.isJdbc4ConnectionTest()
>      HikariConfig.setJdbc4ConnectionTest()
> 
>      HikariDataSource.copyState()
>      HikariDataSource.getScheduledExecutorService()
>      HikariDataSource.setScheduledExecutorService()
>      HikariDataSource.suspendPool()
>      HikariDataSource.resumePool()
>      HikariDataSource.shutdown()
>      HikariDataSource.isInitializationFailFast()
>      HikariDataSource.setInitializationFailFast()
>      HikariDataSource.isJdbc4ConnectionTest()
>      HikariDataSource.setJdbc4ConnectionTest()
> 
></table> ... (truncated)
</details>
<details>
<summary>Commits</summary>

- [`ad827db`](brettwooldridge/HikariCP@ad827db) [maven-release-plugin] prepare release HikariCP-3.2.0
- [`0f06b56`](brettwooldridge/HikariCP@0f06b56) Update pom.xml
- [`3498a14`](brettwooldridge/HikariCP@3498a14) Update CHANGES
- [`88b57c3`](brettwooldridge/HikariCP@88b57c3) Check closed condition before attempting to set network timeout.
- [`6a13980`](brettwooldridge/HikariCP@6a13980) Update validation failure message.
- [`603951f`](brettwooldridge/HikariCP@603951f) Fixes [testcontainers#1126](https://github-redirect.dependabot.com/brettwooldridge/HikariCP/issues/1126) correct error in JavaDoc for HikariConfig.setInitializationFailTi...
- [`5607d8b`](brettwooldridge/HikariCP@5607d8b) Fixes [testcontainers#1141](https://github-redirect.dependabot.com/brettwooldridge/HikariCP/issues/1141) do not throw SQLException when calling isClosed() or close() on a...
- [`8921bb0`](brettwooldridge/HikariCP@8921bb0) Fixes [testcontainers#1137](https://github-redirect.dependabot.com/brettwooldridge/HikariCP/issues/1137) support changing user/password at runtime for DriverDataSource-wr...
- [`851e2d4`](brettwooldridge/HikariCP@851e2d4) Fixes [testcontainers#1137](https://github-redirect.dependabot.com/brettwooldridge/HikariCP/issues/1137) support changing user/password at runtime for DriverDataSource-wr...
- [`71e8688`](brettwooldridge/HikariCP@71e8688) Closes [testcontainers#1114](https://github-redirect.dependabot.com/brettwooldridge/HikariCP/issues/1114) Remove unneeded code.
- Additional commits viewable in [compare view](brettwooldridge/HikariCP@HikariCP-2.6.1...HikariCP-3.2.0)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=com.zaxxer:HikariCP&package-manager=gradle&previous-version=2.6.1&new-version=3.2.0)](https://dependabot.com/compatibility-score.html?dependency-name=com.zaxxer:HikariCP&package-manager=gradle&previous-version=2.6.1&new-version=3.2.0)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

**Note:** This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking `Bump now` in your [Dependabot dashboard](https://app.dependabot.com).

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
kiview pushed a commit to tolkonepiu/testcontainers-java that referenced this pull request Jan 8, 2019
@dependabot @rnorth
Bump HikariCP from 2.6.1 to 3.2.0 in /modules/junit-jupiter (testcont…
bee2101 
…ainers#1072)

[//]: # (dependabot-start)
⚠️  **Dependabot is rebasing this PR** ⚠️ 

If you make any changes to it yourself then they will take precedence over the rebase.

---

[//]: # (dependabot-end)

Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 2.6.1 to 3.2.0.
<details>
<summary>Changelog</summary>

*Sourced from [HikariCP's changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES).*

> HikariCP Changes
> 
> Changes in 3.2.0
> 
>  * check connection closed condition before attempting to set network timeout to avoid spurios exceptions
>    in the log.
> 
>  * updated validation failure message to include recommendation to check maxLifetime value.
> 
>  * fixed 1141 do not throw SQLException when calling isClosed() or close() on a already closed unwrapped
>    Connection, as per JDBC specification.
> 
>  * fixed 1137 support changing user/password at runtime for DriverDataSource-wrapped driver connections.
> 
>  * fixed 1136 log loaded driver when using jdbcUrl.
> 
>  * pull 1135 extract sealed pool check into independent method.
> 
>  * fixed 1126 correct error in JavaDoc for HikariConfig.setInitializationFailTimeout().
> 
>  * fixed 1114 removed unreachable code.
> 
> Changes in 3.1.0
> 
>  * Add get/setCatalog() to HikariConfigMXBean, allowing the catalog to be changed at runtime.
>    The catalog should only be changed while the pool is suspended, and after evicting existing
>    connections via HikariPoolMXBean.softEvictConnections().
> 
> Changes in 3.0.0
> 
>  * Removed previously deprecated methods;
>      HikariConfig.copyState()
>      HikariConfig.getScheduledExecutorService()
>      HikariConfig.setScheduledExecutorService()
>      HikariConfig.isInitializationFailFast()
>      HikariConfig.setInitializationFailFast()
>      HikariConfig.isJdbc4ConnectionTest()
>      HikariConfig.setJdbc4ConnectionTest()
> 
>      HikariDataSource.copyState()
>      HikariDataSource.getScheduledExecutorService()
>      HikariDataSource.setScheduledExecutorService()
>      HikariDataSource.suspendPool()
>      HikariDataSource.resumePool()
>      HikariDataSource.shutdown()
>      HikariDataSource.isInitializationFailFast()
>      HikariDataSource.setInitializationFailFast()
>      HikariDataSource.isJdbc4ConnectionTest()
>      HikariDataSource.setJdbc4ConnectionTest()
> 
></table> ... (truncated)
</details>
<details>
<summary>Commits</summary>

- [`ad827db`](brettwooldridge/HikariCP@ad827db) [maven-release-plugin] prepare release HikariCP-3.2.0
- [`0f06b56`](brettwooldridge/HikariCP@0f06b56) Update pom.xml
- [`3498a14`](brettwooldridge/HikariCP@3498a14) Update CHANGES
- [`88b57c3`](brettwooldridge/HikariCP@88b57c3) Check closed condition before attempting to set network timeout.
- [`6a13980`](brettwooldridge/HikariCP@6a13980) Update validation failure message.
- [`603951f`](brettwooldridge/HikariCP@603951f) Fixes [testcontainers#1126](https://github-redirect.dependabot.com/brettwooldridge/HikariCP/issues/1126) correct error in JavaDoc for HikariConfig.setInitializationFailTi...
- [`5607d8b`](brettwooldridge/HikariCP@5607d8b) Fixes [testcontainers#1141](https://github-redirect.dependabot.com/brettwooldridge/HikariCP/issues/1141) do not throw SQLException when calling isClosed() or close() on a...
- [`8921bb0`](brettwooldridge/HikariCP@8921bb0) Fixes [testcontainers#1137](https://github-redirect.dependabot.com/brettwooldridge/HikariCP/issues/1137) support changing user/password at runtime for DriverDataSource-wr...
- [`851e2d4`](brettwooldridge/HikariCP@851e2d4) Fixes [testcontainers#1137](https://github-redirect.dependabot.com/brettwooldridge/HikariCP/issues/1137) support changing user/password at runtime for DriverDataSource-wr...
- [`71e8688`](brettwooldridge/HikariCP@71e8688) Closes [testcontainers#1114](https://github-redirect.dependabot.com/brettwooldridge/HikariCP/issues/1114) Remove unneeded code.
- Additional commits viewable in [compare view](brettwooldridge/HikariCP@HikariCP-2.6.1...HikariCP-3.2.0)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=com.zaxxer:HikariCP&package-manager=gradle&previous-version=2.6.1&new-version=3.2.0)](https://dependabot.com/compatibility-score.html?dependency-name=com.zaxxer:HikariCP&package-manager=gradle&previous-version=2.6.1&new-version=3.2.0)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

**Note:** This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking `Bump now` in your [Dependabot dashboard](https://app.dependabot.com).

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
rnorth
rnorth approved these changes Jan 9, 2019
View reviewed changes
Copy link
Member

@rnorth rnorth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this, and for the general cleanup of the code @bijukunjummen.

LGTM! Thanks for the contribution!

@rnorth rnorth merged commit cb6a489 into testcontainers:master Jan 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rnorth rnorth rnorth approved these changes

@bsideup bsideup Awaiting requested review from bsideup

@kiview kiview Awaiting requested review from kiview

Assignees
No one assigned
Labels
type/feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bijukunjummen @rnorth @bsideup