Skip to content

Commit

Permalink
Merge pull request #10912 from uncch-rdmc/10889_bump_PG17_FlyWay10
Browse files Browse the repository at this point in the history
bump to Postgres 17, Flyway 10.19, allows earlier versions of PostgreSQL
  • Loading branch information
ofahimIQSS authored Nov 6, 2024
2 parents 092e17f + d1f9970 commit 62d6aa6
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP_IMAGE=gdcc/dataverse:unstable
POSTGRES_VERSION=16
POSTGRES_VERSION=17
DATAVERSE_DB_USER=dataverse
SOLR_VERSION=9.3.0
SKIP_DEPLOY=0
SKIP_DEPLOY=0
7 changes: 7 additions & 0 deletions doc/release-notes/10889_bump_PG17_FlyWay10.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
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.

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.

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.

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.
2 changes: 1 addition & 1 deletion docker/compose/demo/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ services:
postgres:
container_name: "postgres"
hostname: postgres
image: postgres:13
image: postgres:17
restart: on-failure
environment:
- POSTGRES_USER=dataverse
Expand Down
2 changes: 1 addition & 1 deletion modules/dataverse-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@

<!-- Major system components and dependencies -->
<payara.version>6.2024.6</payara.version>
<postgresql.version>42.7.2</postgresql.version>
<postgresql.version>42.7.4</postgresql.version>
<solr.version>9.4.1</solr.version>
<aws.version>1.12.748</aws.version>
<google.library.version>26.30.0</google.library.version>
Expand Down
9 changes: 7 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<packaging.type>war</packaging.type>

<reload4j.version>1.2.18.4</reload4j.version>
<flyway.version>9.22.1</flyway.version>
<flyway.version>10.19.0</flyway.version>
<jhove.version>1.20.1</jhove.version>
<poi.version>5.2.1</poi.version>
<tika.version>2.9.1</tika.version>
Expand Down Expand Up @@ -188,6 +188,11 @@
<artifactId>flyway-core</artifactId>
<version>${flyway.version}</version>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
<version>${flyway.version}</version>
</dependency>
<!-- Enable resolution of the JPA provider in persistence.xml -->
<dependency>
<groupId>org.eclipse.persistence</groupId>
Expand Down Expand Up @@ -1004,7 +1009,7 @@
<skipIntegrationTests>true</skipIntegrationTests>
<!-- Once we truly run tests with Testcontainers, this should be switch to "docker", activating ITs -->
<packaging.type>docker-build</packaging.type>
<postgresql.server.version>16</postgresql.server.version>
<postgresql.server.version>17</postgresql.server.version>

<app.image>gdcc/dataverse:${app.image.tag}</app.image>
<app.image.tag>unstable</app.image.tag>
Expand Down

0 comments on commit 62d6aa6

Please sign in to comment.