diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 41d21ab6..71e40e54 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
git config user.name "Zonky Bot"
git config user.email "bot@zonky.com"
- name: Set up JDK
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 8
@@ -32,4 +32,4 @@ jobs:
MAVEN_USER: ${{ secrets.MAVEN_USER }}
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
SIGNING_PASS: ${{ secrets.SIGNING_PASS }}
- run: mvn -B release:prepare release:perform -DreleaseVersion=$RELEASE_VERSION
\ No newline at end of file
+ run: mvn -B release:prepare release:perform -DreleaseVersion=$RELEASE_VERSION
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e0faa4f9..9064f36a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
- name: Checkout project
uses: actions/checkout@v3
- name: Set up JDK
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
diff --git a/README.md b/README.md
index 1a407e97..72f5c3a2 100644
--- a/README.md
+++ b/README.md
@@ -24,12 +24,12 @@ Add the following Maven dependency:
io.zonky.test
embedded-postgres
- 2.0.4
+ 2.0.6
test
```
-The default version of the embedded postgres is `PostgreSQL 14.8`, but you can change it by following the instructions described in [Postgres version](#postgres-version).
+The default version of the embedded postgres is `PostgreSQL 14.10`, but you can change it by following the instructions described in [Postgres version](#postgres-version).
## Basic Usage
@@ -71,7 +71,7 @@ independent databases gives you.
## Postgres version
-The default version of the embedded postgres is `PostgreSQL 14.8`, but it can be changed by importing `embedded-postgres-binaries-bom` in a required version into your dependency management section.
+The default version of the embedded postgres is `PostgreSQL 14.10`, but it can be changed by importing `embedded-postgres-binaries-bom` in a required version into your dependency management section.
```xml
@@ -79,7 +79,7 @@ The default version of the embedded postgres is `PostgreSQL 14.8`, but it can be
io.zonky.test.postgres
embedded-postgres-binaries-bom
- 15.3.0
+ 16.1.0
pom
import
@@ -97,7 +97,7 @@ The default version of the embedded postgres is `PostgreSQL 14.8`, but it can be
configurations.all {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
if (details.requested.group == 'io.zonky.test.postgres') {
- details.useVersion '15.3.0'
+ details.useVersion '16.1.0'
}
}
}
@@ -105,7 +105,7 @@ The default version of the embedded postgres is `PostgreSQL 14.8`, but it can be
2. If you use Gradle 5+, [Maven BOMs are supported out of the box](https://docs.gradle.org/5.0/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:15.3.0')
+ testImplementation enforcedPlatform('io.zonky.test.postgres:embedded-postgres-binaries-bom:16.1.0')
}
3. Or, you can use [Spring's dependency management plugin](https://docs.spring.io/dependency-management-plugin/docs/current/reference/html/#dependency-management-configuration-bom-import) that provides Maven-like dependency management to Gradle:
@@ -116,7 +116,7 @@ The default version of the embedded postgres is `PostgreSQL 14.8`, but it can be
dependencyManagement {
imports {
- mavenBom 'io.zonky.test.postgres:embedded-postgres-binaries-bom:15.3.0'
+ mavenBom 'io.zonky.test.postgres:embedded-postgres-binaries-bom:16.1.0'
}
}
diff --git a/pom.xml b/pom.xml
index c4bf1e12..56814ef7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
io.zonky.test
embedded-postgres
- 2.0.4
+ 2.0.7
embedded-postgres
Embedded PostgreSQL Server
@@ -30,7 +30,7 @@
UTF-8
UTF-8
- 14.8.0
+ 14.10.1
https://github.com/zonkyio/embedded-postgres
@@ -39,7 +39,7 @@
scm:git:https://github.com/zonkyio/embedded-postgres.git
scm:git:https://github.com/zonkyio/embedded-postgres.git
https://github.com/zonkyio/embedded-postgres
- v2.0.4
+ v2.0.7
@@ -110,7 +110,7 @@
org.apache.commons
commons-compress
- 1.21
+ 1.26.0
org.tukaani
@@ -142,7 +142,7 @@
org.postgresql
postgresql
- 42.3.5
+ 42.7.3
junit
@@ -206,13 +206,13 @@
net.sourceforge.pmd
pmd-core
- 6.25.0
+ 6.55.0
compile
net.sourceforge.pmd
pmd-java
- 6.25.0
+ 6.55.0
compile
diff --git a/src/main/java/io/zonky/test/db/postgres/embedded/DefaultPostgresBinaryResolver.java b/src/main/java/io/zonky/test/db/postgres/embedded/DefaultPostgresBinaryResolver.java
index aa295a7e..b90fda68 100644
--- a/src/main/java/io/zonky/test/db/postgres/embedded/DefaultPostgresBinaryResolver.java
+++ b/src/main/java/io/zonky/test/db/postgres/embedded/DefaultPostgresBinaryResolver.java
@@ -63,12 +63,13 @@ public InputStream getPgBinary(String system, String machineHardware) throws IOE
return resource.getInputStream();
}
- if (StringUtils.equals(system, "Darwin") && StringUtils.equals(machineHardware, "aarch64")) {
+ if ((StringUtils.equals(system, "Darwin") && StringUtils.equals(machineHardware, "aarch64")) // NOPMD
+ || (StringUtils.equals(system, "Windows") && StringUtils.equals(architecture, "arm_64"))) { // NOPMD
resource = findPgBinary(normalize(format("postgres-%s-%s.txz", system, "x86_64")));
if (resource != null) {
- logger.warn("No native binaries supporting aarch64 architecture found. " +
- "Trying to use binaries for amd64 architecture instead: '{}'. " +
- "Make sure you have Rosetta 2 emulation enabled. " +
+ logger.warn("No native binaries supporting ARM architecture found. " +
+ "Trying to use binaries for x64 architecture instead: '{}'. " +
+ "Make sure you have enabled emulation for this purpose. " +
"Note that performance may be degraded.", resource.getFilename());
return resource.getInputStream();
}