From d1d1f445d3669181b718c09597ed3e6f99f3a54a Mon Sep 17 00:00:00 2001
From: "don.sizemore" <don.sizemore@github.com>
Date: Wed, 8 Dec 2021 13:16:32 -0500
Subject: [PATCH 1/4] #8295 bump Flyway to support PostgreSQL 14

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index dfaf8278897..37dd051fe34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     
         <jakartaee-api.version>8.0.0</jakartaee-api.version>
         <payara.version>5.2021.5</payara.version>
-        <postgresql.version>42.2.19</postgresql.version>
+        <postgresql.version>42.3.1</postgresql.version>
         <aws.version>1.11.762</aws.version>
         <slf4j.version>1.7.32</slf4j.version>
         <commons.io.version>2.11.0</commons.io.version>
@@ -42,7 +42,7 @@
         <testcontainers.version>1.15.0</testcontainers.version>
         <microbean-mpconfig.version>0.4.1</microbean-mpconfig.version>
         <mockito.version>2.28.2</mockito.version>
-        <flyway.version>5.2.4</flyway.version>
+        <flyway.version>8.2.0</flyway.version>
         <jhove.version>1.20.1</jhove.version>
         <jacoco.version>0.8.6</jacoco.version>
     </properties>

From 73aa1140b1d181cf6bddc8de2847cb59caaa1965 Mon Sep 17 00:00:00 2001
From: "don.sizemore" <don.sizemore@github.com>
Date: Fri, 4 Feb 2022 09:13:38 -0500
Subject: [PATCH 2/4] #8295 bump pgjdbc 42.3.1 to 42.3.2 to address
 CVE-2022-21724

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 074e08ca7ba..93d823145f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     
         <jakartaee-api.version>8.0.0</jakartaee-api.version>
         <payara.version>5.2021.5</payara.version>
-        <postgresql.version>42.3.1</postgresql.version>
+        <postgresql.version>42.3.2</postgresql.version>
         <aws.version>1.11.762</aws.version>
         <slf4j.version>1.7.35</slf4j.version>
         <reload4j.version>1.2.18.4</reload4j.version>

From d1e34d33d94ced0339dbdf09d23bf9dfd6457851 Mon Sep 17 00:00:00 2001
From: "don.sizemore" <don.sizemore@github.com>
Date: Thu, 12 May 2022 13:41:57 -0400
Subject: [PATCH 3/4] #8295 missed bumping PG JDBC to 42.3.5, let's try Flyway
 8.5.10

---
 modules/dataverse-parent/pom.xml | 2 +-
 pom.xml                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml
index 4673fb0cf96..e85608dd0c4 100644
--- a/modules/dataverse-parent/pom.xml
+++ b/modules/dataverse-parent/pom.xml
@@ -147,7 +147,7 @@
     
         <!-- Major system components and dependencies -->
         <payara.version>5.2021.6</payara.version>
-        <postgresql.version>42.3.3</postgresql.version>
+        <postgresql.version>42.3.5</postgresql.version>
         <solr.version>8.11.1</solr.version>
         <aws.version>1.11.762</aws.version>
         <google.cloud.version>0.157.0</google.cloud.version>
diff --git a/pom.xml b/pom.xml
index d69a6305328..ce9f1c4b63d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <properties>
         <skipUnitTests>false</skipUnitTests>
         <reload4j.version>1.2.18.4</reload4j.version>
-        <flyway.version>8.2.0</flyway.version>
+        <flyway.version>8.5.10</flyway.version>
         <jhove.version>1.20.1</jhove.version>
         <jacoco.version>0.8.7</jacoco.version>
         <poi.version>5.2.1</poi.version>

From 36bd1e598f32b6c8cade19ba8cf43e93093f0dde Mon Sep 17 00:00:00 2001
From: "don.sizemore" <don.sizemore@github.com>
Date: Thu, 12 May 2022 14:30:14 -0400
Subject: [PATCH 4/4] #8295 add release notes per pdurbin

---
 doc/release-notes/8295-support-postgresql-14.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/release-notes/8295-support-postgresql-14.md

diff --git a/doc/release-notes/8295-support-postgresql-14.md b/doc/release-notes/8295-support-postgresql-14.md
new file mode 100644
index 00000000000..7d658a5e65e
--- /dev/null
+++ b/doc/release-notes/8295-support-postgresql-14.md
@@ -0,0 +1,8 @@
+This release upgrades the bundled PostgreSQL JDBC driver to support major version 14.
+
+Note that the newer PostgreSQL driver required a Flyway version bump, which entails positive and negative consequences:
+
+- The newer version of Flyway supports PostgreSQL 14 and includes a number of security fixes.
+- As of version 8.0 the Flyway Community Edition dropped support for PostgreSQL 9.6 and older.
+
+Upgrade instructions may be found under “PostgreSQL Update” in the 5.10 release notes: https://github.com/IQSS/dataverse/releases/tag/v5.10