Merge remote-tracking branch 'origin/master' into 2.0.x

# Conflicts:
#	README.md
#	build.gradle
#	embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayConfigSnapshot.java
#	embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/postgres/DockerPostgresDatabaseProvider.java
#	embedded-database-spring-test/src/main/resources/META-INF/spring-configuration-metadata.json

Author: tomix26

build.gradle

@@ -40,7 +40,12 @@ ext {
                     [name: '7.0.4',  flyway: '7.0.4',   'flyway-test': '7.0.0',    spring: '5.3.1',           'spring-boot': '2.4.0',           'zonky-postgres': 'default'],
                     [name: '7.1.1',  flyway: '7.1.1',   'flyway-test': '7.0.0',    spring: '5.3.1',           'spring-boot': '2.4.0',           'zonky-postgres': 'default'],
                     [name: '7.2.1',  flyway: '7.2.1',   'flyway-test': '7.0.0',    spring: '5.3.1',           'spring-boot': '2.4.0',           'zonky-postgres': 'default'],
-                    [name: '7.3.0',  flyway: '7.3.0',   'flyway-test': '7.0.0',    spring: '5.3.1',           'spring-boot': '2.4.0',           'zonky-postgres': 'default'],
+                    [name: '7.3.2',  flyway: '7.3.2',   'flyway-test': '7.0.0',    spring: '5.3.1',           'spring-boot': '2.4.0',           'zonky-postgres': 'default'],
+                    [name: '7.4.0',  flyway: '7.4.0',   'flyway-test': '7.0.0',    spring: '5.3.1',           'spring-boot': '2.4.0',           'zonky-postgres': 'default'],
+                    [name: '7.5.4',  flyway: '7.5.4',   'flyway-test': '7.0.0',    spring: '5.3.1',           'spring-boot': '2.4.0',           'zonky-postgres': 'default'],
+                    [name: '7.6.0',  flyway: '7.6.0',   'flyway-test': '7.0.0',    spring: '5.3.1',           'spring-boot': '2.4.0',           'zonky-postgres': 'default'],
+                    [name: '7.7.3',  flyway: '7.7.3',   'flyway-test': '7.0.0',    spring: '5.3.1',           'spring-boot': '2.4.0',           'zonky-postgres': 'default'],
+                    [name: '7.8.2',  flyway: '7.8.2',   'flyway-test': '7.0.0',    spring: '5.3.1',           'spring-boot': '2.4.0',           'zonky-postgres': 'default'],
                     [name: 'no_sb',  flyway: 'default', 'flyway-test': 'default',                                                               'zonky-postgres': 'default']
             ]],
             [name: 'liquibase', versions: [
@@ -199,7 +204,7 @@ project(':embedded-database-spring-test') {
         compile 'org.testcontainers:mysql:1.15.3'
         compile 'org.testcontainers:mariadb:1.15.3'
 
-        compile 'io.zonky.test:embedded-postgres:1.2.9', optional
+        compile 'io.zonky.test:embedded-postgres:1.2.10', optional
         compile 'com.opentable.components:otj-pg-embedded:0.13.3', optional
         compile 'ru.yandex.qatools.embed:postgresql-embedded:2.10', optional
 

embedded-database-spring-test/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -292,28 +292,40 @@
           "value": "postgres:9.5"
         },
         {
-          "value": "mdillon/postgis:11-alpine"
+          "value": "postgis/postgis:13-3.1-alpine"
         },
         {
-          "value": "mdillon/postgis:10-alpine"
+          "value": "postgis/postgis:12-3.1-alpine"
         },
         {
-          "value": "mdillon/postgis:9.6-alpine"
+          "value": "postgis/postgis:11-3.1-alpine"
         },
         {
-          "value": "mdillon/postgis:9.5-alpine"
+          "value": "postgis/postgis:10-3.1-alpine"
         },
         {
-          "value": "mdillon/postgis:11"
+          "value": "postgis/postgis:9.6-3.1-alpine"
         },
         {
-          "value": "mdillon/postgis:10"
+          "value": "postgis/postgis:9.5-3.0-alpine"
         },
         {
-          "value": "mdillon/postgis:9.6"
+          "value": "postgis/postgis:13-3.1"
         },
         {
-          "value": "mdillon/postgis:9.5"
+          "value": "postgis/postgis:12-3.1"
+        },
+        {
+          "value": "postgis/postgis:11-3.1"
+        },
+        {
+          "value": "postgis/postgis:10-3.1"
+        },
+        {
+          "value": "postgis/postgis:9.6-3.1"
+        },
+        {
+          "value": "postgis/postgis:9.5-3.0"
         }
       ],
       "providers": [

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/DockerPostgresProviderWithPostgisImageIntegrationTest.java

@@ -39,7 +39,7 @@
 @RunWith(SpringRunner.class)
 @AutoConfigureEmbeddedDatabase(type = POSTGRES, provider = DOCKER)
 @TestPropertySource(properties = {
-        "zonky.test.database.postgres.docker.image=mdillon/postgis:9.6-alpine"
+        "zonky.test.database.postgres.docker.image=postgis/postgis:9.6-3.1-alpine"
 })
 @ContextConfiguration
 public class DockerPostgresProviderWithPostgisImageIntegrationTest {
@@ -67,6 +67,6 @@ public void testDataSource() throws SQLException {
 
         jdbcTemplate.update("create extension postgis");
         String postgisVersion = jdbcTemplate.queryForObject("select postgis_version()", String.class);
-        assertThat(postgisVersion).startsWith("2.5");
+        assertThat(postgisVersion).startsWith("3.1");
     }
 }