From d45cea7ddf5d59fa4ef1335715d57f12aa7ffe7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Manteaux?= Date: Thu, 15 Sep 2022 14:26:18 +0200 Subject: [PATCH 1/9] Dependencies upgrade --- plume-framework-dependencies/pom.xml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/plume-framework-dependencies/pom.xml b/plume-framework-dependencies/pom.xml index bfdffc0..3593db1 100644 --- a/plume-framework-dependencies/pom.xml +++ b/plume-framework-dependencies/pom.xml @@ -14,24 +14,23 @@ Gather versions of various libraries used by Plume Framework - 2.2.2 + 2.3.0 5.1.0 - 2.41 + 2.43.2 31.1-jre 1.18.24 - 1.2.11 - 1.7.32 + 1.4.0 + 2.0.0 1.4.2 7.1.1 5.0.1 5.0.0 1.6.0 - 8.5.8 - 2.1.212 - - 2.13.2 + 9.3.0 + 2.1.214 + 2.13.4 2.35 - 2.1.13 + 2.2.2 2.6.1 1.7 1.2.0 @@ -39,7 +38,7 @@ 2.3.0 4.13.2 - 3.22.0 + 3.23.1 1.1 @@ -201,8 +200,7 @@ com.fasterxml.jackson.core jackson-databind - - 2.13.2.2 + ${jackson.version} com.fasterxml.jackson.core From 0ab47b1a4df053de2c2c3c9ec4de60faa54dc27a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Manteaux?= Date: Fri, 16 Sep 2022 12:55:01 +0200 Subject: [PATCH 2/9] [maven-release-plugin] prepare release 4.1.0 --- plume-conf/pom.xml | 2 +- plume-db-querydsl-codegen/pom.xml | 2 +- plume-db-querydsl/pom.xml | 2 +- plume-db-test/pom.xml | 2 +- plume-db/pom.xml | 2 +- plume-framework-dependencies/pom.xml | 2 +- plume-mail/pom.xml | 2 +- plume-scheduler/pom.xml | 2 +- plume-services/pom.xml | 2 +- plume-web-jersey/pom.xml | 2 +- pom.xml | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plume-conf/pom.xml b/plume-conf/pom.xml index b1d5d27..9470957 100644 --- a/plume-conf/pom.xml +++ b/plume-conf/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.0.1-SNAPSHOT + 4.1.0 plume-conf diff --git a/plume-db-querydsl-codegen/pom.xml b/plume-db-querydsl-codegen/pom.xml index 244c246..a318db4 100644 --- a/plume-db-querydsl-codegen/pom.xml +++ b/plume-db-querydsl-codegen/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.0.1-SNAPSHOT + 4.1.0 plume-db-querydsl-codegen diff --git a/plume-db-querydsl/pom.xml b/plume-db-querydsl/pom.xml index ef4f678..7d07b3f 100644 --- a/plume-db-querydsl/pom.xml +++ b/plume-db-querydsl/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.0.1-SNAPSHOT + 4.1.0 plume-db-querydsl diff --git a/plume-db-test/pom.xml b/plume-db-test/pom.xml index e238fc9..d787729 100644 --- a/plume-db-test/pom.xml +++ b/plume-db-test/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.0.1-SNAPSHOT + 4.1.0 plume-db-test diff --git a/plume-db/pom.xml b/plume-db/pom.xml index b80d45e..04a1ee0 100644 --- a/plume-db/pom.xml +++ b/plume-db/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.0.1-SNAPSHOT + 4.1.0 plume-db diff --git a/plume-framework-dependencies/pom.xml b/plume-framework-dependencies/pom.xml index 3593db1..89a0306 100644 --- a/plume-framework-dependencies/pom.xml +++ b/plume-framework-dependencies/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.0.1-SNAPSHOT + 4.1.0 plume-framework-dependencies diff --git a/plume-mail/pom.xml b/plume-mail/pom.xml index f708980..70ae768 100644 --- a/plume-mail/pom.xml +++ b/plume-mail/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.0.1-SNAPSHOT + 4.1.0 plume-mail diff --git a/plume-scheduler/pom.xml b/plume-scheduler/pom.xml index f1cda06..2b82f71 100644 --- a/plume-scheduler/pom.xml +++ b/plume-scheduler/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.0.1-SNAPSHOT + 4.1.0 plume-scheduler diff --git a/plume-services/pom.xml b/plume-services/pom.xml index 3753b2b..a7f6433 100644 --- a/plume-services/pom.xml +++ b/plume-services/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.0.1-SNAPSHOT + 4.1.0 plume-services diff --git a/plume-web-jersey/pom.xml b/plume-web-jersey/pom.xml index d70aa56..35489c9 100644 --- a/plume-web-jersey/pom.xml +++ b/plume-web-jersey/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.0.1-SNAPSHOT + 4.1.0 plume-web-jersey diff --git a/pom.xml b/pom.xml index dee6af3..fb4453f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.coreoz plume-parent - 4.0.1-SNAPSHOT + 4.1.0 pom Plume Parent @@ -37,7 +37,7 @@ scm:git:git@github.com:Coreoz/Plume.git scm:git:git@github.com:Coreoz/Plume.git https://github.com/Coreoz/Plume - HEAD + 4.1.0 From 0097e0154d976e3b5cf79edff57b8b745c5fe76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Manteaux?= Date: Fri, 16 Sep 2022 12:55:15 +0200 Subject: [PATCH 3/9] [maven-release-plugin] prepare for next development iteration --- plume-conf/pom.xml | 2 +- plume-db-querydsl-codegen/pom.xml | 2 +- plume-db-querydsl/pom.xml | 2 +- plume-db-test/pom.xml | 2 +- plume-db/pom.xml | 2 +- plume-framework-dependencies/pom.xml | 2 +- plume-mail/pom.xml | 2 +- plume-scheduler/pom.xml | 2 +- plume-services/pom.xml | 2 +- plume-web-jersey/pom.xml | 2 +- pom.xml | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plume-conf/pom.xml b/plume-conf/pom.xml index 9470957..2fdfe6e 100644 --- a/plume-conf/pom.xml +++ b/plume-conf/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.1.0 + 4.1.1-SNAPSHOT plume-conf diff --git a/plume-db-querydsl-codegen/pom.xml b/plume-db-querydsl-codegen/pom.xml index a318db4..3ac9ca4 100644 --- a/plume-db-querydsl-codegen/pom.xml +++ b/plume-db-querydsl-codegen/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.1.0 + 4.1.1-SNAPSHOT plume-db-querydsl-codegen diff --git a/plume-db-querydsl/pom.xml b/plume-db-querydsl/pom.xml index 7d07b3f..8d49f5d 100644 --- a/plume-db-querydsl/pom.xml +++ b/plume-db-querydsl/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.1.0 + 4.1.1-SNAPSHOT plume-db-querydsl diff --git a/plume-db-test/pom.xml b/plume-db-test/pom.xml index d787729..dc9ca63 100644 --- a/plume-db-test/pom.xml +++ b/plume-db-test/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.1.0 + 4.1.1-SNAPSHOT plume-db-test diff --git a/plume-db/pom.xml b/plume-db/pom.xml index 04a1ee0..0bd79a1 100644 --- a/plume-db/pom.xml +++ b/plume-db/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.1.0 + 4.1.1-SNAPSHOT plume-db diff --git a/plume-framework-dependencies/pom.xml b/plume-framework-dependencies/pom.xml index 89a0306..28b9a57 100644 --- a/plume-framework-dependencies/pom.xml +++ b/plume-framework-dependencies/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.1.0 + 4.1.1-SNAPSHOT plume-framework-dependencies diff --git a/plume-mail/pom.xml b/plume-mail/pom.xml index 70ae768..d9cca6b 100644 --- a/plume-mail/pom.xml +++ b/plume-mail/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.1.0 + 4.1.1-SNAPSHOT plume-mail diff --git a/plume-scheduler/pom.xml b/plume-scheduler/pom.xml index 2b82f71..2b40283 100644 --- a/plume-scheduler/pom.xml +++ b/plume-scheduler/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.1.0 + 4.1.1-SNAPSHOT plume-scheduler diff --git a/plume-services/pom.xml b/plume-services/pom.xml index a7f6433..133bf10 100644 --- a/plume-services/pom.xml +++ b/plume-services/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.1.0 + 4.1.1-SNAPSHOT plume-services diff --git a/plume-web-jersey/pom.xml b/plume-web-jersey/pom.xml index 35489c9..a9fd0f0 100644 --- a/plume-web-jersey/pom.xml +++ b/plume-web-jersey/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.1.0 + 4.1.1-SNAPSHOT plume-web-jersey diff --git a/pom.xml b/pom.xml index fb4453f..cd5a66a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.coreoz plume-parent - 4.1.0 + 4.1.1-SNAPSHOT pom Plume Parent @@ -37,7 +37,7 @@ scm:git:git@github.com:Coreoz/Plume.git scm:git:git@github.com:Coreoz/Plume.git https://github.com/Coreoz/Plume - 4.1.0 + HEAD From 6789d9fa61aa5db45df10bbf11d7a69f4b3684e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Manteaux?= Date: Mon, 19 Sep 2022 14:19:37 +0200 Subject: [PATCH 4/9] Update plume demo URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ece7fc..ce88ae4 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ it is possible to adapt these connectors to work with Spring or CDI. Demo ---- -Sample projects can be found here: . +Sample projects can be found here: . Getting started --------------- From 71c369c9af8899f1145ab7323a7fb712949dac6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Manteaux?= Date: Mon, 19 Sep 2022 18:18:50 +0200 Subject: [PATCH 5/9] Add upgrade instructions for v4 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ce88ae4..8bfd9d0 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,10 @@ Plume Framework require at least Java 11. Its modules contains connectors for Plume Framework is maintained by [Coreoz](http://coreoz.com/) and licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0). +Upgrade from 3.x to 4.x +----------------------- +See upgrade instructions in the [release details](https://github.com/Coreoz/Plume/releases/tag/4.0.0). + Upgrade from 2.x to 3.x ----------------------- See upgrade instructions in the [release details](https://github.com/Coreoz/Plume/releases/tag/3.0.0). From 6b61eb0569a6bd90de71ead0bc1d77eaac26b646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Manteaux?= Date: Thu, 29 Sep 2022 09:58:48 +0200 Subject: [PATCH 6/9] Handle correctly rollback exception + simplify executeAndReturn override --- .../coreoz/plume/db/transaction/TransactionManager.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java b/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java index af3a7e3..0f46766 100644 --- a/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java +++ b/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java @@ -1,5 +1,6 @@ package com.coreoz.plume.db.transaction; +import java.io.IOException; import java.sql.Connection; import java.sql.SQLException; import java.util.function.Consumer; @@ -43,7 +44,7 @@ public T executeAndReturn(Function toExecuteOnDb) { Connection connection = null; Boolean initialAutoCommit = null; try { - connection = dataSource.getConnection(); + connection = dataSource().getConnection(); initialAutoCommit = connection.getAutoCommit(); connection.setAutoCommit(false); T result = toExecuteOnDb.apply(connection); @@ -55,7 +56,11 @@ public T executeAndReturn(Function toExecuteOnDb) { connection.rollback(); } } catch (Throwable e2) { - // never mind if the connection cannot be rolled back + // if the rollback failed, raise an exception about the rollback failure + // and the original error + RuntimeException combinedException = new RuntimeException(e2); + combinedException.addSuppressed(new IOException(e)); + throw combinedException; } Throwables.throwIfUnchecked(e); throw new RuntimeException(e); From bb2e9f505aa746852a970b633696d7c052ff87c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Manteaux?= Date: Fri, 30 Sep 2022 11:25:41 +0200 Subject: [PATCH 7/9] Fix Swagger annotation version --- plume-framework-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plume-framework-dependencies/pom.xml b/plume-framework-dependencies/pom.xml index 28b9a57..1551a66 100644 --- a/plume-framework-dependencies/pom.xml +++ b/plume-framework-dependencies/pom.xml @@ -255,7 +255,7 @@ io.swagger.core.v3 - swagger-annotations + swagger-annotations2 ${swagger.version} From 936f50000ba84b99160496a4813ae4a4d0e7b6f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Manteaux?= Date: Thu, 24 Nov 2022 11:23:26 +0100 Subject: [PATCH 8/9] Upgrade jackson --- plume-framework-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plume-framework-dependencies/pom.xml b/plume-framework-dependencies/pom.xml index 1551a66..06f0904 100644 --- a/plume-framework-dependencies/pom.xml +++ b/plume-framework-dependencies/pom.xml @@ -28,7 +28,7 @@ 1.6.0 9.3.0 2.1.214 - 2.13.4 + 2.14.1 2.35 2.2.2 2.6.1 From d5f7f08c931175f1bf94a117745612164f6f6fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Manteaux?= Date: Wed, 30 Nov 2022 17:18:20 +0100 Subject: [PATCH 9/9] Delete useless IOException wrapper --- .../com/coreoz/plume/db/transaction/TransactionManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java b/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java index 0f46766..08c7eb2 100644 --- a/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java +++ b/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java @@ -1,6 +1,5 @@ package com.coreoz.plume.db.transaction; -import java.io.IOException; import java.sql.Connection; import java.sql.SQLException; import java.util.function.Consumer; @@ -59,7 +58,7 @@ public T executeAndReturn(Function toExecuteOnDb) { // if the rollback failed, raise an exception about the rollback failure // and the original error RuntimeException combinedException = new RuntimeException(e2); - combinedException.addSuppressed(new IOException(e)); + combinedException.addSuppressed(e); throw combinedException; } Throwables.throwIfUnchecked(e);