Skip to content

Commit 6eacb14

Browse files
authored
Merge pull request #146 from zonkyio/embedded-postgres-1.2.10
#84 upgrade to embedded-postgres 1.2.10
2 parents fb0d72e + ac042cb commit 6eacb14

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ project(':embedded-database-spring-test') {
164164
dependencies {
165165
compile project(':embedded-database-spring-test-autoconfigure')
166166

167-
compile 'io.zonky.test:embedded-postgres:1.2.9'
167+
compile 'io.zonky.test:embedded-postgres:1.2.10'
168168
compile 'org.testcontainers:postgresql:1.15.1', optional
169169
compile 'com.opentable.components:otj-pg-embedded:0.13.1', optional
170170
compile 'ru.yandex.qatools.embed:postgresql-embedded:2.10', optional

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

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@
126126
{
127127
"name": "zonky.test.database.postgres.docker.image",
128128
"values": [
129+
{
130+
"value": "postgres:13-alpine"
131+
},
129132
{
130133
"value": "postgres:12-alpine"
131134
},
@@ -142,7 +145,7 @@
142145
"value": "postgres:9.5-alpine"
143146
},
144147
{
145-
"value": "postgres:9.4-alpine"
148+
"value": "postgres:13"
146149
},
147150
{
148151
"value": "postgres:12"
@@ -160,37 +163,40 @@
160163
"value": "postgres:9.5"
161164
},
162165
{
163-
"value": "postgres:9.4"
166+
"value": "postgis/postgis:13-3.1-alpine"
167+
},
168+
{
169+
"value": "postgis/postgis:12-3.1-alpine"
164170
},
165171
{
166-
"value": "mdillon/postgis:11-alpine"
172+
"value": "postgis/postgis:11-3.1-alpine"
167173
},
168174
{
169-
"value": "mdillon/postgis:10-alpine"
175+
"value": "postgis/postgis:10-3.1-alpine"
170176
},
171177
{
172-
"value": "mdillon/postgis:9.6-alpine"
178+
"value": "postgis/postgis:9.6-3.1-alpine"
173179
},
174180
{
175-
"value": "mdillon/postgis:9.5-alpine"
181+
"value": "postgis/postgis:9.5-3.0-alpine"
176182
},
177183
{
178-
"value": "mdillon/postgis:9.4-alpine"
184+
"value": "postgis/postgis:13-3.1"
179185
},
180186
{
181-
"value": "mdillon/postgis:11"
187+
"value": "postgis/postgis:12-3.1"
182188
},
183189
{
184-
"value": "mdillon/postgis:10"
190+
"value": "postgis/postgis:11-3.1"
185191
},
186192
{
187-
"value": "mdillon/postgis:9.6"
193+
"value": "postgis/postgis:10-3.1"
188194
},
189195
{
190-
"value": "mdillon/postgis:9.5"
196+
"value": "postgis/postgis:9.6-3.1"
191197
},
192198
{
193-
"value": "mdillon/postgis:9.4"
199+
"value": "postgis/postgis:9.5-3.0"
194200
}
195201
],
196202
"providers": [

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
@RunWith(SpringRunner.class)
3939
@AutoConfigureEmbeddedDatabase(beanName = "dataSource", provider = DOCKER)
4040
@TestPropertySource(properties = {
41-
"zonky.test.database.postgres.docker.image=mdillon/postgis:9.6-alpine"
41+
"zonky.test.database.postgres.docker.image=postgis/postgis:9.6-3.1-alpine"
4242
})
4343
@ContextConfiguration
4444
public class DockerProviderWithPostgisImageIntegrationTest {
@@ -66,6 +66,6 @@ public void testDataSource() throws SQLException {
6666

6767
jdbcTemplate.update("create extension postgis");
6868
String postgisVersion = jdbcTemplate.queryForObject("select postgis_version()", String.class);
69-
assertThat(postgisVersion).startsWith("2.5");
69+
assertThat(postgisVersion).startsWith("3.1");
7070
}
7171
}

0 commit comments

Comments
 (0)