From 09d5e8fb017b846e08f21523a101164f5d3a04ff Mon Sep 17 00:00:00 2001
From: Michael Bell <mikebell90@users.noreply.github.com>
Date: Wed, 5 Jun 2024 07:58:57 -0700
Subject: [PATCH 1/4] Flyway 10

---
 CHANGELOG.md |  9 +++++++++
 pom.xml      | 29 ++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5c4769..6e96fcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,13 @@
 
+1.1.0
+-----
+* automatic modules
+* flyway 10.10. 
+  * Note this is now modularized as `flyway-core` and `flyway-database-postgresql`
+  * This brings in the `flyway-database-postgresql` and `jackson-dataformat-toml` as runtime optional dependencies.
+
+Note for internal OT users: This is compatible with otj-SBT3, but not otj-SBT2.
+
 1.0.3
 ----
 * commons compress 1.26.0 (used by testcontainers) updated for a CVE.
diff --git a/pom.xml b/pom.xml
index 2576ff4..6212ce8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,11 +48,12 @@
     <project.build.targetJdk>11</project.build.targetJdk>
     <maven.compiler.target>${project.build.targetJdk}</maven.compiler.target>
     <project.build.systemJdk>${project.build.targetJdk}</project.build.systemJdk>
-    <dep.testcontainers.version>1.19.6</dep.testcontainers.version>
-    <dep.postgres-jdbc.version>42.7.2</dep.postgres-jdbc.version>
+    <dep.testcontainers.version>1.19.8</dep.testcontainers.version>
+    <dep.postgres-jdbc.version>42.7.3</dep.postgres-jdbc.version>
     <dep.liquibase.version>4.23.1</dep.liquibase.version>
     <dep.slf4j.version>1.7.36</dep.slf4j.version>
-    <dep.flyway.version>9.16.3</dep.flyway.version>
+    <dep.jackson.version>2.15.2</dep.jackson.version>
+    <dep.flyway.version>10.10.0</dep.flyway.version>
     <dep.commons-lang.version>3.14.0</dep.commons-lang.version>
     <dep.commons-compress.version>1.26.0</dep.commons-compress.version>
     <dep.junit.version>4.13.2</dep.junit.version>
@@ -93,12 +94,27 @@
       <scope>runtime</scope>
     </dependency>
 
+
+
     <dependency>
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-core</artifactId>
       <optional>true</optional>
       <version>${dep.flyway.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.flywaydb</groupId>
+      <artifactId>flyway-database-postgresql</artifactId>
+      <optional>true</optional>
+      <scope>runtime</scope>
+      <version>${dep.flyway.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-toml</artifactId>
+      <scope>runtime</scope>
+      <optional>true</optional>
+    </dependency>
 
     <dependency>
       <groupId>org.liquibase</groupId>
@@ -158,6 +174,13 @@
         <artifactId>testcontainers</artifactId>
         <version>${dep.testcontainers.version}</version>
        </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson</groupId>
+        <artifactId>jackson-bom</artifactId>
+        <version>${dep.jackson.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

From b18fe4fb610dc9329392d86ae19a8bdb716ec2f9 Mon Sep 17 00:00:00 2001
From: Michael Bell <mikebell90@users.noreply.github.com>
Date: Wed, 5 Jun 2024 08:11:47 -0700
Subject: [PATCH 2/4] Update maven.yml

---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 619b7d0..1c9a468 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

From 30ce95dfcf33b21536c3d2ec0afd8fde1a880612 Mon Sep 17 00:00:00 2001
From: Michael Bell <mikebell90@users.noreply.github.com>
Date: Wed, 5 Jun 2024 08:14:09 -0700
Subject: [PATCH 3/4] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e96fcc..9cf81fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * flyway 10.10. 
   * Note this is now modularized as `flyway-core` and `flyway-database-postgresql`
   * This brings in the `flyway-database-postgresql` and `jackson-dataformat-toml` as runtime optional dependencies.
+  * Note Flyway requires java 17
 
 Note for internal OT users: This is compatible with otj-SBT3, but not otj-SBT2.
 

From 06c2f2135ddd7725d92f303c773b856a0a84e3d5 Mon Sep 17 00:00:00 2001
From: Michael Bell <mikebell90@users.noreply.github.com>
Date: Mon, 17 Jun 2024 07:32:04 -0700
Subject: [PATCH 4/4] README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 873d8be..f7484ac 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 OpenTable Embedded PostgreSQL Component
 =======================================
 
-Note: This library requires Java 11+.
+Note: This library requires Java 11+. However, Flyway 10 requires Java 17.
 
 Allows embedding PostgreSQL into Java application code, using Docker containers.
 Excellent for allowing you to unit