Skip to content

Commit 575de8b

Browse files
committed
#42 upgrade to embedded-postgres-binaries 10.7
1 parent 283bf05 commit 575de8b

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Add the following Maven dependency:
3434
</dependency>
3535
```
3636

37-
The default version of the embedded database is `PostgreSQL 10.6`, but you can change it by following the instructions described in [Changing the version of postgres binaries](#changing-the-version-of-postgres-binaries).
37+
The default version of the embedded database is `PostgreSQL 10.7`, but you can change it by following the instructions described in [Changing the version of postgres binaries](#changing-the-version-of-postgres-binaries).
3838

3939
### Basic Usage
4040

@@ -71,9 +71,9 @@ public class EmptyDatabaseIntegrationTest {
7171
}
7272
```
7373

74-
### Creating multiple independent databases
74+
### Creating multiple databases within a single test class
7575

76-
Because the `@AutoConfigureEmbeddedDatabase` is a repeatable annotation, you can annotate a test class with multiple annotations to create multiple independent databases.
76+
The `@AutoConfigureEmbeddedDatabase` is a repeatable annotation, so you can annotate a test class with multiple annotations to create multiple independent databases.
7777
Each of them may have completely different configuration parameters, including the database provider as demonstrated in the example below.
7878

7979
Note that if multiple annotations on a single class are applied, some optimization techniques can not be used and database initialization may be slower.
@@ -397,7 +397,7 @@ public class DockerProviderIntegrationTest {
397397
The provider configuration can be controlled by properties in the `zonky.test.database.postgres.docker` group.
398398

399399
```properties
400-
zonky.test.database.postgres.docker.image=postgres:10.6-alpine # Docker image containing PostgreSQL database.
400+
zonky.test.database.postgres.docker.image=postgres:10.7-alpine # Docker image containing PostgreSQL database.
401401
zonky.test.database.postgres.docker.tmpfs.enabled=false # Whether to mount postgres data directory as tmpfs.
402402
zonky.test.database.postgres.docker.tmpfs.options=rw,noexec,nosuid # Mount options used to configure the tmpfs filesystem.
403403
```
@@ -480,7 +480,7 @@ public class YandexProviderIntegrationTest {
480480
The provider configuration can be controlled by properties in the `zonky.test.database.postgres.yandex-provider` group.
481481

482482
```properties
483-
zonky.test.database.postgres.yandex-provider.postgres-version=10.6-1 # Version of EnterpriseDB PostgreSQL binaries (https://www.enterprisedb.com/download-postgresql-binaries).
483+
zonky.test.database.postgres.yandex-provider.postgres-version=10.7-1 # Version of EnterpriseDB PostgreSQL binaries (https://www.enterprisedb.com/download-postgresql-binaries).
484484
```
485485

486486
### Database Prefetching
@@ -616,7 +616,7 @@ But this optimization has no effect if `FlywayTestExecutionListener` is also app
616616

617617
### ERROR: role "..." already exists
618618

619-
Since version 1.4.0, database prefetching has been improved. All databases are stored within a single database cluster.
619+
Since version [1.4.0](https://github.com/zonkyio/embedded-database-spring-test/releases/tag/v1.4.0), database prefetching has been improved. All databases are stored within a single database cluster.
620620
It speeds up the preparation of databases, but in some rare cases, if your database scripts use some global objects inappropriately, this change can cause problems. If necessary, you can change this behavior back by setting the following property:
621621

622622
```properties
@@ -643,8 +643,8 @@ extracted from the JDK download.
643643

644644
## Project dependencies
645645

646-
* [PostgreSQL Binaries](https://github.com/zonkyio/embedded-postgres-binaries) (10.6)
647-
* [Embedded Postgres](https://github.com/zonkyio/embedded-postgres) (1.2.2) - a fork of [OpenTable Embedded PostgreSQL Component](https://github.com/opentable/otj-pg-embedded)
646+
* [PostgreSQL Binaries](https://github.com/zonkyio/embedded-postgres-binaries) (10.7)
647+
* [Embedded Postgres](https://github.com/zonkyio/embedded-postgres) (1.2.3) - a fork of [OpenTable Embedded PostgreSQL Component](https://github.com/opentable/otj-pg-embedded)
648648
* [Spring Framework](http://www.springsource.org/) (4.3.22) - `spring-test`, `spring-context` modules
649649
* [Flyway](https://github.com/flyway/) (5.0.7)
650650
* [Guava](https://github.com/google/guava) (23.0)

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ext {
2929

3030
[core: '5.0.7', test: '5.0.0'] // default version
3131
]
32-
embeddedPostgresVersions = ['9.3.25', '9.4.20', '9.5.15', '9.6.11', '10.6.0', '11.1.0']
32+
embeddedPostgresVersions = ['9.4.21', '9.5.16', '9.6.12', '10.7.0', '11.2.0']
3333

3434
flywayCoreVersion = flywayVersions.last().core
3535
flywayTestVersion = flywayVersions.last().test
@@ -150,7 +150,7 @@ project(':embedded-database-spring-test') {
150150
dependencies {
151151
compile project(':embedded-database-spring-test-autoconfigure')
152152

153-
compile 'io.zonky.test:embedded-postgres:1.2.2'
153+
compile 'io.zonky.test:embedded-postgres:1.2.3'
154154
compile 'org.testcontainers:postgresql:1.10.6', optional
155155
compile 'com.opentable.components:otj-pg-embedded:0.13.1', optional
156156
compile 'ru.yandex.qatools.embed:postgresql-embedded:2.10', optional

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/impl/DockerPostgresDatabaseProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public DatabaseInstance load(DatabaseConfig config) {
6565
private final ClientConfig clientConfig;
6666

6767
public DockerPostgresDatabaseProvider(Environment environment) {
68-
String dockerImage = environment.getProperty("zonky.test.database.postgres.docker.image", "postgres:10.6-alpine");
68+
String dockerImage = environment.getProperty("zonky.test.database.postgres.docker.image", "postgres:10.7-alpine");
6969
String tmpfsOptions = environment.getProperty("zonky.test.database.postgres.docker.tmpfs.options", "rw,noexec,nosuid");
7070
boolean tmpfsEnabled = environment.getProperty("zonky.test.database.postgres.docker.tmpfs.enabled", boolean.class, false);
7171

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/impl/YandexPostgresDatabaseProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public DatabaseInstance load(DatabaseConfig config) throws IOException {
6868
private final ClientConfig clientConfig;
6969

7070
public YandexPostgresDatabaseProvider(Environment environment) {
71-
String postgresVersion = environment.getProperty("zonky.test.database.postgres.yandex-provider.postgres-version", "10.6-1");
71+
String postgresVersion = environment.getProperty("zonky.test.database.postgres.yandex-provider.postgres-version", "10.7-1");
7272

7373
Map<String, String> initdbProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.initdb.properties");
7474
Map<String, String> configProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.server.properties");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"name": "zonky.test.database.postgres.docker.image",
7070
"type": "java.lang.String",
7171
"description": "Docker image containing PostgreSQL database.",
72-
"defaultValue": "postgres:10.6-alpine"
72+
"defaultValue": "postgres:10.7-alpine"
7373
},
7474
{
7575
"name": "zonky.test.database.postgres.docker.tmpfs.enabled",
@@ -93,7 +93,7 @@
9393
"name": "zonky.test.database.postgres.yandex-provider.postgres-version",
9494
"type": "java.lang.String",
9595
"description": "Version of EnterpriseDB PostgreSQL binaries (https://www.enterprisedb.com/download-postgresql-binaries).",
96-
"defaultValue": "10.6-1"
96+
"defaultValue": "10.7-1"
9797
}
9898
],
9999
"hints": [

0 commit comments

Comments
 (0)