From 7983278e0bacc0bfe7c39f8c796c7dcf82a22f0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 01:22:00 +0000 Subject: [PATCH 1/3] chore(deps): bump org.flywaydb:flyway-core from 9.22.3 to 10.7.2 Bumps [org.flywaydb:flyway-core](https://github.com/flyway/flyway) from 9.22.3 to 10.7.2. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-9.22.3...flyway-10.7.2) --- updated-dependencies: - dependency-name: org.flywaydb:flyway-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fd872a844..c8296ca15 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ awaitility = "4.2.0" aws = "2.24.1" azure-identity = "1.11.2" bouncyCastle-jdk18on = "1.77" -flyway = "9.22.3" +flyway = "10.7.2" iron-vc = "0.8.1" jackson = "2.16.1" jakarta-json = "2.0.1" From e6ea9ac22a3fe3cd5cd0f9bcf6edd3693b491c69 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Wed, 14 Feb 2024 14:55:22 +0100 Subject: [PATCH 2/3] add explicit PG support to flyway --- edc-extensions/postgresql-migration/build.gradle.kts | 4 ++++ gradle/libs.versions.toml | 1 + 2 files changed, 5 insertions(+) diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts index 22f26a7c2..ed6ad7469 100644 --- a/edc-extensions/postgresql-migration/build.gradle.kts +++ b/edc-extensions/postgresql-migration/build.gradle.kts @@ -31,6 +31,10 @@ dependencies { runtimeOnly(libs.postgres) implementation(libs.flyway.core) + // starting from flyway 10, they've moved to a more modular structure, + // so we need to add PG support explicitly + // https://documentation.red-gate.com/flyway/release-notes-and-older-versions/release-notes-for-flyway-engine + runtimeOnly(libs.flyway.database.postgres) testImplementation(testFixtures(libs.edc.sql.core)) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c8296ca15..35a01b066 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -175,6 +175,7 @@ aws-s3 = { module = "software.amazon.awssdk:s3", version.ref = "aws" } aws-s3transfer = { module = "software.amazon.awssdk:s3-transfer-manager", version.ref = "aws" } bouncyCastle-bcpkixJdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bouncyCastle-jdk18on" } flyway-core = { module = "org.flywaydb:flyway-core", version.ref = "flyway" } +flyway-database-postgres = { module = "org.flywaydb:flyway-database-postgresql", version.ref = "flyway" } jackson-datatypeJsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" } jacksonJsonP = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp", version.ref = "jackson" } jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" } From 719ddefebc9317a8c4368b2eb8f4d34f4143adcc Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Wed, 14 Feb 2024 15:12:10 +0100 Subject: [PATCH 3/3] DEPENDENCIES --- DEPENDENCIES | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 45ba48a97..a94d1083e 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -418,7 +418,8 @@ maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.20, EPL-2.0 OR Apache-2. maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.flywaydb/flyway-core/9.22.3, Apache-2.0, approved, #10349 +maven/mavencentral/org.flywaydb/flyway-core/10.7.2, , restricted, clearlydefined +maven/mavencentral/org.flywaydb/flyway-database-postgresql/10.7.2, , restricted, clearlydefined maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish