Skip to content

Commit

Permalink
Merge pull request #73 from zonkyio/postgres-10.11
Browse files Browse the repository at this point in the history
#71 Upgrade to embedded-postgres-binaries 10.11
  • Loading branch information
tomix26 authored Nov 19, 2019
2 parents 81264d5 + 1788ce6 commit 1092c6d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Add the following Maven dependency:
</dependency>
```

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).
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).

### Basic Usage

Expand Down Expand Up @@ -272,7 +272,7 @@ The version of the binaries can be managed by importing `embedded-postgres-binar
<dependency>
<groupId>io.zonky.test.postgres</groupId>
<artifactId>embedded-postgres-binaries-bom</artifactId>
<version>11.5.0</version>
<version>11.6.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -290,15 +290,15 @@ The version of the binaries can be managed by importing `embedded-postgres-binar
configurations.all {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
if (details.requested.group == 'io.zonky.test.postgres') {
details.useVersion '11.5.0'
details.useVersion '11.6.0'
}
}
}

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:

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

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:
Expand All @@ -309,7 +309,7 @@ The version of the binaries can be managed by importing `embedded-postgres-binar
dependencyManagement {
imports {
mavenBom 'io.zonky.test.postgres:embedded-postgres-binaries-bom:11.5.0'
mavenBom 'io.zonky.test.postgres:embedded-postgres-binaries-bom:11.6.0'
}
}

Expand Down Expand Up @@ -397,7 +397,7 @@ public class DockerProviderIntegrationTest {
The provider configuration can be controlled by properties in the `zonky.test.database.postgres.docker` group.

```properties
zonky.test.database.postgres.docker.image=postgres:10.10-alpine # Docker image containing PostgreSQL database.
zonky.test.database.postgres.docker.image=postgres:10.11-alpine # Docker image containing PostgreSQL database.
zonky.test.database.postgres.docker.tmpfs.enabled=false # Whether to mount postgres data directory as tmpfs.
zonky.test.database.postgres.docker.tmpfs.options=rw,noexec,nosuid # Mount options used to configure the tmpfs filesystem.
```
Expand Down Expand Up @@ -504,7 +504,7 @@ public class YandexProviderIntegrationTest {
The provider configuration can be controlled by properties in the `zonky.test.database.postgres.yandex-provider` group.

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

### Database Prefetching
Expand Down Expand Up @@ -667,8 +667,8 @@ extracted from the JDK download.

## Project dependencies

* [PostgreSQL Binaries](https://github.com/zonkyio/embedded-postgres-binaries) (10.10)
* [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)
* [PostgreSQL Binaries](https://github.com/zonkyio/embedded-postgres-binaries) (10.11)
* [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)
* [Spring Framework](http://www.springsource.org/) (4.3.22) - `spring-test`, `spring-context` modules
* [Flyway](https://github.com/flyway/) (5.0.7)
* [Guava](https://github.com/google/guava) (23.0)
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ext {

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

flywayCoreVersion = flywayVersions.last().core
flywayTestVersion = flywayVersions.last().test
Expand Down Expand Up @@ -152,7 +152,7 @@ project(':embedded-database-spring-test') {
dependencies {
compile project(':embedded-database-spring-test-autoconfigure')

compile 'io.zonky.test:embedded-postgres:1.2.5'
compile 'io.zonky.test:embedded-postgres:1.2.6'
compile 'org.testcontainers:postgresql:1.12.1', optional
compile 'com.opentable.components:otj-pg-embedded:0.13.1', optional
compile 'ru.yandex.qatools.embed:postgresql-embedded:2.10', optional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public DatabaseInstance load(DatabaseConfig config) {
private final ClientConfig clientConfig;

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public DatabaseInstance load(DatabaseConfig config) throws IOException {
private final ClientConfig clientConfig;

public YandexPostgresDatabaseProvider(Environment environment) {
String postgresVersion = environment.getProperty("zonky.test.database.postgres.yandex-provider.postgres-version", "10.10-1");
String postgresVersion = environment.getProperty("zonky.test.database.postgres.yandex-provider.postgres-version", "10.11-1");

Map<String, String> initdbProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.initdb.properties");
Map<String, String> configProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.server.properties");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"name": "zonky.test.database.postgres.docker.image",
"type": "java.lang.String",
"description": "Docker image containing PostgreSQL database.",
"defaultValue": "postgres:10.10-alpine"
"defaultValue": "postgres:10.11-alpine"
},
{
"name": "zonky.test.database.postgres.docker.tmpfs.enabled",
Expand All @@ -93,7 +93,7 @@
"name": "zonky.test.database.postgres.yandex-provider.postgres-version",
"type": "java.lang.String",
"description": "Version of EnterpriseDB PostgreSQL binaries (https://www.enterprisedb.com/download-postgresql-binaries).",
"defaultValue": "10.10-1"
"defaultValue": "10.11-1"
}
],
"hints": [
Expand Down

0 comments on commit 1092c6d

Please sign in to comment.