Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flyway 10 #192

Merged
merged 5 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@

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 Flyway requires java 17

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.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
29 changes: 26 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
Loading