Skip to content

Commit 9eef9b3

Browse files
authored
Updated docker-java to 3.1.0-rc-3, enforced org.jetbrains:annotations:15.0 (#652) (#672)
1 parent 860193a commit 9eef9b3

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
99

1010
### Changed
1111
- Database container images are now pinned to a specific version rather than using `latest`. The tags selected are the most recent as of the time of this change. If a JDBC URL is used with no tag specified, a WARN level log message is output, pending a future change to make tags mandatory in the JDBC URL. ([\#671](https://github.com/testcontainers/testcontainers-java/issues/671))
12+
- Updated docker-java to 3.1.0-rc-3, enforced `org.jetbrains:annotations:15.0`. ([\#672](https://github.com/testcontainers/testcontainers-java/issues/672))
1213

1314
## [1.7.1] - 2018-04-20
1415

core/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,13 @@ dependencies {
106106
compile 'org.apache.commons:commons-compress:1.15'
107107
// Added for JDK9 compatibility since it's missing this package
108108
compile 'javax.xml.bind:jaxb-api:2.3.0'
109-
compile 'org.rnorth.duct-tape:duct-tape:1.0.7'
109+
compile ('org.rnorth.duct-tape:duct-tape:1.0.7') {
110+
exclude(group: 'org.jetbrains', module: 'annotations')
111+
}
112+
110113
compile 'org.rnorth.visible-assertions:visible-assertions:2.1.0'
111114

112-
shaded ('com.github.docker-java:docker-java:3.1.0-rc-2') {
115+
shaded ('com.github.docker-java:docker-java:3.1.0-rc-3') {
113116
exclude(group: 'org.glassfish.jersey.core')
114117
exclude(group: 'org.glassfish.jersey.connectors')
115118
exclude(group: 'log4j')

0 commit comments

Comments
 (0)