Skip to content

Commit 1092c6d

Browse files
authored
Merge pull request #73 from zonkyio/postgres-10.11
#71 Upgrade to embedded-postgres-binaries 10.11
2 parents 81264d5 + 1788ce6 commit 1092c6d

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

README.md

Lines changed: 9 additions & 9 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.10`, 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.11`, 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

@@ -272,7 +272,7 @@ The version of the binaries can be managed by importing `embedded-postgres-binar
272272
<dependency>
273273
<groupId>io.zonky.test.postgres</groupId>
274274
<artifactId>embedded-postgres-binaries-bom</artifactId>
275-
<version>11.5.0</version>
275+
<version>11.6.0</version>
276276
<type>pom</type>
277277
<scope>import</scope>
278278
</dependency>
@@ -290,15 +290,15 @@ The version of the binaries can be managed by importing `embedded-postgres-binar
290290
configurations.all {
291291
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
292292
if (details.requested.group == 'io.zonky.test.postgres') {
293-
details.useVersion '11.5.0'
293+
details.useVersion '11.6.0'
294294
}
295295
}
296296
}
297297

298298
2. If you use Gradle 5+, [Maven BOMs are supported out of the box](https://docs.gradle.org/current/userguide/managing_transitive_dependencies.html#sec:bom_import), so you can import the bom:
299299

300300
dependencies {
301-
implementation enforcedPlatform('io.zonky.test.postgres:embedded-postgres-binaries-bom:11.5.0')
301+
implementation enforcedPlatform('io.zonky.test.postgres:embedded-postgres-binaries-bom:11.6.0')
302302
}
303303

304304
3. Or, you can use [Spring's dependency management plugin](https://docs.spring.io/dependency-management-plugin/docs/current-SNAPSHOT/reference/html5/#dependency-management-configuration-bom-import) that provides Maven-like dependency management to Gradle:
@@ -309,7 +309,7 @@ The version of the binaries can be managed by importing `embedded-postgres-binar
309309
310310
dependencyManagement {
311311
imports {
312-
mavenBom 'io.zonky.test.postgres:embedded-postgres-binaries-bom:11.5.0'
312+
mavenBom 'io.zonky.test.postgres:embedded-postgres-binaries-bom:11.6.0'
313313
}
314314
}
315315

@@ -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.10-alpine # Docker image containing PostgreSQL database.
400+
zonky.test.database.postgres.docker.image=postgres:10.11-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
```
@@ -504,7 +504,7 @@ public class YandexProviderIntegrationTest {
504504
The provider configuration can be controlled by properties in the `zonky.test.database.postgres.yandex-provider` group.
505505

506506
```properties
507-
zonky.test.database.postgres.yandex-provider.postgres-version=10.10-1 # Version of EnterpriseDB PostgreSQL binaries (https://www.enterprisedb.com/download-postgresql-binaries).
507+
zonky.test.database.postgres.yandex-provider.postgres-version=10.11-1 # Version of EnterpriseDB PostgreSQL binaries (https://www.enterprisedb.com/download-postgresql-binaries).
508508
```
509509

510510
### Database Prefetching
@@ -667,8 +667,8 @@ extracted from the JDK download.
667667

668668
## Project dependencies
669669

670-
* [PostgreSQL Binaries](https://github.com/zonkyio/embedded-postgres-binaries) (10.10)
671-
* [Embedded Postgres](https://github.com/zonkyio/embedded-postgres) (1.2.4) - a fork of [OpenTable Embedded PostgreSQL Component](https://github.com/opentable/otj-pg-embedded)
670+
* [PostgreSQL Binaries](https://github.com/zonkyio/embedded-postgres-binaries) (10.11)
671+
* [Embedded Postgres](https://github.com/zonkyio/embedded-postgres) (1.2.6) - a fork of [OpenTable Embedded PostgreSQL Component](https://github.com/opentable/otj-pg-embedded)
672672
* [Spring Framework](http://www.springsource.org/) (4.3.22) - `spring-test`, `spring-context` modules
673673
* [Flyway](https://github.com/flyway/) (5.0.7)
674674
* [Guava](https://github.com/google/guava) (23.0)

build.gradle

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

3232
[core: '5.0.7', test: '5.0.0'] // default version
3333
]
34-
embeddedPostgresVersions = ['9.4.24', '9.5.19', '9.6.15', '10.10.0', '11.5.0']
34+
embeddedPostgresVersions = ['9.4.25', '9.5.20', '9.6.16', '10.11.0', '11.6.0', '12.1.0']
3535

3636
flywayCoreVersion = flywayVersions.last().core
3737
flywayTestVersion = flywayVersions.last().test
@@ -152,7 +152,7 @@ project(':embedded-database-spring-test') {
152152
dependencies {
153153
compile project(':embedded-database-spring-test-autoconfigure')
154154

155-
compile 'io.zonky.test:embedded-postgres:1.2.5'
155+
compile 'io.zonky.test:embedded-postgres:1.2.6'
156156
compile 'org.testcontainers:postgresql:1.12.1', optional
157157
compile 'com.opentable.components:otj-pg-embedded:0.13.1', optional
158158
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
@@ -71,7 +71,7 @@ public DatabaseInstance load(DatabaseConfig config) {
7171
private final ClientConfig clientConfig;
7272

7373
public DockerPostgresDatabaseProvider(Environment environment, ObjectProvider<List<PostgreSQLContainerCustomizer>> containerCustomizers) {
74-
String dockerImage = environment.getProperty("zonky.test.database.postgres.docker.image", "postgres:10.10-alpine");
74+
String dockerImage = environment.getProperty("zonky.test.database.postgres.docker.image", "postgres:10.11-alpine");
7575
String tmpfsOptions = environment.getProperty("zonky.test.database.postgres.docker.tmpfs.options", "rw,noexec,nosuid");
7676
boolean tmpfsEnabled = environment.getProperty("zonky.test.database.postgres.docker.tmpfs.enabled", boolean.class, false);
7777

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.10-1");
71+
String postgresVersion = environment.getProperty("zonky.test.database.postgres.yandex-provider.postgres-version", "10.11-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.10-alpine"
72+
"defaultValue": "postgres:10.11-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.10-1"
96+
"defaultValue": "10.11-1"
9797
}
9898
],
9999
"hints": [

0 commit comments

Comments
 (0)