From 43c7688c4996938b36b13754ff0e83968eb1117e Mon Sep 17 00:00:00 2001 From: Eric Fiege Date: Tue, 13 Feb 2024 10:10:54 +0100 Subject: [PATCH 1/3] fix: Exchange Connection-Pool #793 --- CHANGELOG.md | 3 ++- extensions/postgres-flyway/build.gradle.kts | 4 +++- gradle.properties | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ebf2bbf4..2b09a21ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,10 +15,11 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). #### Minor Changes - Add new MDS fields and migrate existing MDS asset keys to mobilityDCAT-AP -- Fix Connector-Restricted-Usage Policy #### Patch Changes - Docs: Enhanced starting a Http-Pull over the EDC-Ui documentation +- Fix Connector-Restricted-Usage Policy +- Exchange Connection-Pool ### Deployment Migration Notes diff --git a/extensions/postgres-flyway/build.gradle.kts b/extensions/postgres-flyway/build.gradle.kts index 7b2a6ab18..d2d94b3f7 100644 --- a/extensions/postgres-flyway/build.gradle.kts +++ b/extensions/postgres-flyway/build.gradle.kts @@ -1,5 +1,7 @@ val edcVersion: String by project val edcGroup: String by project +val tractusVersion: String by project +val tractusGroup: String by project val flywayVersion: String by project val postgresVersion: String by project val lombokVersion: String by project @@ -19,7 +21,7 @@ dependencies { // Adds Database-Related EDC-Extensions (EDC-SQL-Stores, JDBC-Driver, Pool and Transactions) implementation("${edcGroup}:control-plane-sql:${edcVersion}") implementation("${edcGroup}:data-plane-instance-store-sql:${edcVersion}") - implementation("${edcGroup}:sql-pool-apache-commons:${edcVersion}") + implementation("${tractusGroup}:sql-pool:${tractusVersion}") implementation("${edcGroup}:transaction-local:${edcVersion}") implementation("org.postgresql:postgresql:${postgresVersion}") diff --git a/gradle.properties b/gradle.properties index 1603fab2d..85ff7ebf8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,8 @@ sovityEdcExtensionGroup=de.sovity.edc.ext sovityEdcGroup=de.sovity.edc edcGroup=org.eclipse.edc edcVersion=0.2.1 +tractusGroup=org.eclipse.tractusx.edc +tractusVersion=0.5.3 assertj=3.23.1 jupiterVersion=5.8.2 mockitoVersion=4.8.0 From d87b72d22a469c26f6cfd07221d18d7a43324a98 Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Tue, 13 Feb 2024 10:28:27 +0100 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b09a21ad..4514fb05c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). #### Patch Changes - Docs: Enhanced starting a Http-Pull over the EDC-Ui documentation - Fix Connector-Restricted-Usage Policy -- Exchange Connection-Pool +- Fix Connection-Pool issues by switching to the Tractus-X Connection Pool for `<0.4.1` Eclipse EDC. ### Deployment Migration Notes From db7f7bf605dca8fdae28ee11b324e4b6f6493f79 Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Tue, 13 Feb 2024 10:28:55 +0100 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4514fb05c..7acfe568a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). #### Patch Changes - Docs: Enhanced starting a Http-Pull over the EDC-Ui documentation - Fix Connector-Restricted-Usage Policy -- Fix Connection-Pool issues by switching to the Tractus-X Connection Pool for `<0.4.1` Eclipse EDC. +- Fix Connection-Pool issues by switching to the Tractus-X Connection Pool. ### Deployment Migration Notes