Merge branch 'Coreoz:master' into master

Coreoz · Dec 1, 2022 · a0169a5 · a0169a5
2 parents 06efa47 + d5f7f08
commit a0169a5
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 27 deletions.
diff --git 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). 
@@ -39,7 +43,7 @@ it is possible to adapt these connectors to work with Spring or CDI.
 
 Demo
 ----
-Sample projects can be found here: <https://github.com/Coreoz/Plume-demo>.
+Sample projects can be found here: <https://github.com/Coreoz/Plume-showcase>.
 
 Getting started
 ---------------

diff --git a/plume-conf/pom.xml b/plume-conf/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-parent</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-conf</artifactId>

diff --git a/plume-db-querydsl-codegen/pom.xml b/plume-db-querydsl-codegen/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-parent</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-db-querydsl-codegen</artifactId>

diff --git a/plume-db-querydsl/pom.xml b/plume-db-querydsl/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-parent</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-db-querydsl</artifactId>

diff --git a/plume-db-test/pom.xml b/plume-db-test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-parent</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-db-test</artifactId>

diff --git a/plume-db/pom.xml b/plume-db/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-parent</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-db</artifactId>

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
@@ -43,7 +43,7 @@ public <T> T executeAndReturn(Function<Connection, T> 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 +55,11 @@ public <T> T executeAndReturn(Function<Connection, T> 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(e);
+				throw combinedException;
 			}
 			Throwables.throwIfUnchecked(e);
 			throw new RuntimeException(e);

diff --git a/plume-framework-dependencies/pom.xml b/plume-framework-dependencies/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-parent</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-framework-dependencies</artifactId>
@@ -14,32 +14,31 @@
 	<description>Gather versions of various libraries used by Plume Framework</description>
 
 	<properties>
-		<wisp.version>2.2.2</wisp.version>
+		<wisp.version>2.3.0</wisp.version>
 		<guice.version>5.1.0</guice.version>
-		<dagger.version>2.41</dagger.version>
+		<dagger.version>2.43.2</dagger.version>
 		<guava.version>31.1-jre</guava.version>
 		<lombok.version>1.18.24</lombok.version>
-		<logback.version>1.2.11</logback.version>
-		<slf4j.version>1.7.32</slf4j.version>
+		<logback.version>1.4.0</logback.version>
+		<slf4j.version>2.0.0</slf4j.version>
 		<config.version>1.4.2</config.version>
 		<simple-java-mail.version>7.1.1</simple-java-mail.version>
 		<hikaricp.version>5.0.1</hikaricp.version>
 		<querydsl.version>5.0.0</querydsl.version>
 		<sql2o.version>1.6.0</sql2o.version>
-		<flyway.version>8.5.8</flyway.version>
-		<h2.version>2.1.212</h2.version>
-		<!-- TODO jackson-databind version should be changed to use ${jackson.version}  -->
-		<jackson.version>2.13.2</jackson.version>
+		<flyway.version>9.3.0</flyway.version>
+		<h2.version>2.1.214</h2.version>
+		<jackson.version>2.14.1</jackson.version>
 		<jersey.version>2.35</jersey.version>
-		<swagger.version>2.1.13</swagger.version>
+		<swagger.version>2.2.2</swagger.version>
 		<hk2-guice-bridge.version>2.6.1</hk2-guice-bridge.version>
 		<commons-validator.version>1.7</commons-validator.version>
 		<javax-activation.version>1.2.0</javax-activation.version>
 		<javax-annotation.version>1.3.2</javax-annotation.version>
 		<javax-xml.version>2.3.0</javax-xml.version>
 
 		<junit.version>4.13.2</junit.version>
-		<assertj.version>3.22.0</assertj.version>
+		<assertj.version>3.23.1</assertj.version>
 		<guice-runner.version>1.1</guice-runner.version>
 	</properties>
 
@@ -201,8 +200,7 @@
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-databind</artifactId>
-				<!-- <version>${jackson.version}</version> -->
-				<version>2.13.2.2</version>
+				<version>${jackson.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
@@ -257,7 +255,7 @@
 			</dependency>
 			<dependency>
 				<groupId>io.swagger.core.v3</groupId>
-				<artifactId>swagger-annotations</artifactId>
+				<artifactId>swagger-annotations2</artifactId>
 				<version>${swagger.version}</version>
 			</dependency>
 			<dependency>

diff --git a/plume-mail/pom.xml b/plume-mail/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-parent</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-mail</artifactId>

diff --git a/plume-scheduler/pom.xml b/plume-scheduler/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-parent</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-scheduler</artifactId>

diff --git a/plume-services/pom.xml b/plume-services/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-parent</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-services</artifactId>

diff --git a/plume-web-jersey/pom.xml b/plume-web-jersey/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-parent</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-web-jersey</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.coreoz</groupId>
 	<artifactId>plume-parent</artifactId>
-	<version>4.0.1-SNAPSHOT</version>
+	<version>4.1.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Plume Parent</name>