Skip to content

Commit 62d6aa6

Browse files
authored
Merge pull request #10912 from uncch-rdmc/10889_bump_PG17_FlyWay10
bump to Postgres 17, Flyway 10.19, allows earlier versions of PostgreSQL
2 parents 092e17f + d1f9970 commit 62d6aa6

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP_IMAGE=gdcc/dataverse:unstable
2-
POSTGRES_VERSION=16
2+
POSTGRES_VERSION=17
33
DATAVERSE_DB_USER=dataverse
44
SOLR_VERSION=9.3.0
5-
SKIP_DEPLOY=0
5+
SKIP_DEPLOY=0
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
This release bumps both the Postgres JDBC driver and Flyway versions. This should better support Postgres version 17, and as of version 10 Flyway no longer requires a paid subscription to support older versions of Postgres.
2+
3+
While we don't encourage the use of older Postgres versions, this flexibility may benefit some of our long-standing installations in their upgrade paths. Postgres 13 remains the version used with automated testing.
4+
5+
As part of this update, the containerized development environment now uses Postgres 17 instead of 16. Developers must delete their data (`rm -rf docker-dev-volumes`) and start with an empty database. They can rerun the quickstart in the dev guide.
6+
7+
The Docker compose file used for [evaluations or demos](https://dataverse-guide--10912.org.readthedocs.build/en/10912/container/running/demo.html) has been upgraded from Postgres 13 to 17.

docker/compose/demo/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ services:
7777
postgres:
7878
container_name: "postgres"
7979
hostname: postgres
80-
image: postgres:13
80+
image: postgres:17
8181
restart: on-failure
8282
environment:
8383
- POSTGRES_USER=dataverse

modules/dataverse-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149

150150
<!-- Major system components and dependencies -->
151151
<payara.version>6.2024.6</payara.version>
152-
<postgresql.version>42.7.2</postgresql.version>
152+
<postgresql.version>42.7.4</postgresql.version>
153153
<solr.version>9.4.1</solr.version>
154154
<aws.version>1.12.748</aws.version>
155155
<google.library.version>26.30.0</google.library.version>

pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<packaging.type>war</packaging.type>
2828

2929
<reload4j.version>1.2.18.4</reload4j.version>
30-
<flyway.version>9.22.1</flyway.version>
30+
<flyway.version>10.19.0</flyway.version>
3131
<jhove.version>1.20.1</jhove.version>
3232
<poi.version>5.2.1</poi.version>
3333
<tika.version>2.9.1</tika.version>
@@ -188,6 +188,11 @@
188188
<artifactId>flyway-core</artifactId>
189189
<version>${flyway.version}</version>
190190
</dependency>
191+
<dependency>
192+
<groupId>org.flywaydb</groupId>
193+
<artifactId>flyway-database-postgresql</artifactId>
194+
<version>${flyway.version}</version>
195+
</dependency>
191196
<!-- Enable resolution of the JPA provider in persistence.xml -->
192197
<dependency>
193198
<groupId>org.eclipse.persistence</groupId>
@@ -1004,7 +1009,7 @@
10041009
<skipIntegrationTests>true</skipIntegrationTests>
10051010
<!-- Once we truly run tests with Testcontainers, this should be switch to "docker", activating ITs -->
10061011
<packaging.type>docker-build</packaging.type>
1007-
<postgresql.server.version>16</postgresql.server.version>
1012+
<postgresql.server.version>17</postgresql.server.version>
10081013

10091014
<app.image>gdcc/dataverse:${app.image.tag}</app.image>
10101015
<app.image.tag>unstable</app.image.tag>

0 commit comments

Comments
 (0)