Skip to content

Commit 135b1f6

Browse files
authored
Merge branch 'master' into localstack-hostname-external
2 parents 92995e1 + 8e871d0 commit 135b1f6

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

docs/_headers

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/search/search_index.json
2+
Access-Control-Allow-Origin: *

modules/localstack/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
33
dependencies {
44
compile project(':testcontainers')
55

6-
compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.626'
7-
testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.626'
8-
testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.626'
6+
compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.636'
7+
testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.636'
8+
testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
99
}

modules/mariadb/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ dependencies {
66
testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.4'
77
testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
88
testCompile 'commons-dbutils:commons-dbutils:1.7'
9-
testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.24'
9+
testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.26'
1010
testCompile 'org.vibur:vibur-dbcp:22.2'
1111
}

modules/mysql/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies {
55

66
testCompile 'mysql:mysql-connector-java:8.0.17'
77
testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
8-
testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.24'
8+
testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.26'
99
testCompile 'commons-dbutils:commons-dbutils:1.7'
1010
testCompile 'org.vibur:vibur-dbcp:22.2'
1111
}

modules/spock/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010

1111
testCompile project(':mysql')
1212
testCompile project(':postgresql')
13-
testCompile 'com.zaxxer:HikariCP:3.4.0'
13+
testCompile 'com.zaxxer:HikariCP:3.4.1'
1414
testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
1515

1616
testRuntime 'org.postgresql:postgresql:42.2.8'

0 commit comments

Comments
 (0)