From 919773eb4aea7f7481ae761652a9f3a7d3c346f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=A9=20Strysewske?= <mate.strysewske@vitagroup.ag>
Date: Thu, 7 Sep 2023 11:49:19 +0200
Subject: [PATCH 1/3] [GITFLOW]updating poms for 1.88.1 branch with snapshot
 versions

---
 sormas-api/pom.xml                       | 2 +-
 sormas-app/pom.xml                       | 2 +-
 sormas-backend/pom.xml                   | 2 +-
 sormas-base/pom.xml                      | 2 +-
 sormas-cargoserver/pom.xml               | 2 +-
 sormas-ear/pom.xml                       | 2 +-
 sormas-keycloak-service-provider/pom.xml | 2 +-
 sormas-rest/pom.xml                      | 2 +-
 sormas-serverlibs/pom.xml                | 2 +-
 sormas-ui/pom.xml                        | 2 +-
 sormas-widgetset/pom.xml                 | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml
index 477ed070b02..aa746a7d1ec 100644
--- a/sormas-api/pom.xml
+++ b/sormas-api/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.88.0</version>
+		<version>1.88.1-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml
index 3a3a532b5ad..07fa3e66e1c 100644
--- a/sormas-app/pom.xml
+++ b/sormas-app/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.88.0</version>
+		<version>1.88.1-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml
index 72fae75314b..43d0a59e1ee 100644
--- a/sormas-backend/pom.xml
+++ b/sormas-backend/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.88.0</version>
+		<version>1.88.1-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml
index 520692220e1..6969f5a5e43 100644
--- a/sormas-base/pom.xml
+++ b/sormas-base/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>de.symeda.sormas</groupId>
 	<artifactId>sormas-base</artifactId>
 	<packaging>pom</packaging>
-	<version>1.88.0</version>
+	<version>1.88.1-SNAPSHOT</version>
 
 	<properties>
 		<maven.minimum.version>3.6.3</maven.minimum.version>
diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml
index c1b830c6f48..30c46dc1db2 100644
--- a/sormas-cargoserver/pom.xml
+++ b/sormas-cargoserver/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>de.symeda.sormas</groupId>
         <artifactId>sormas-base</artifactId>
-        <version>1.88.0</version>
+        <version>1.88.1-SNAPSHOT</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
 
diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml
index 6126a952cf3..6a64563b80e 100644
--- a/sormas-ear/pom.xml
+++ b/sormas-ear/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.88.0</version>
+		<version>1.88.1-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml
index b0c61e211e9..60e1fb5a002 100644
--- a/sormas-keycloak-service-provider/pom.xml
+++ b/sormas-keycloak-service-provider/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.88.0</version>
+		<version>1.88.1-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml
index 014f1d668bf..7c0031295f7 100644
--- a/sormas-rest/pom.xml
+++ b/sormas-rest/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.88.0</version>
+		<version>1.88.1-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-serverlibs/pom.xml b/sormas-serverlibs/pom.xml
index e0d08f38448..f07223d2f44 100644
--- a/sormas-serverlibs/pom.xml
+++ b/sormas-serverlibs/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.88.0</version>
+		<version>1.88.1-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml
index 8fbf791a120..bc28461b4fa 100644
--- a/sormas-ui/pom.xml
+++ b/sormas-ui/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.88.0</version>
+		<version>1.88.1-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml
index 87bac3399db..db444473395 100644
--- a/sormas-widgetset/pom.xml
+++ b/sormas-widgetset/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>1.88.0</version>
+        <version>1.88.1-SNAPSHOT</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

From 0a3956461f85a254c460d0c8008f5c5039a9bdf3 Mon Sep 17 00:00:00 2001
From: Levente Gal <levente.gal.ext@vitagroup.ag>
Date: Thu, 7 Sep 2023 17:42:36 +0300
Subject: [PATCH 2/3] Fixed #12513 Multiple bouncycastle versions in the
 release producing exceptions after fetching external messages

---
 sormas-backend/pom.xml    |  2 +-
 sormas-base/pom.xml       |  8 ++++----
 sormas-serverlibs/pom.xml | 16 ++++++++++++++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml
index 43d0a59e1ee..6aaf11d9cef 100644
--- a/sormas-backend/pom.xml
+++ b/sormas-backend/pom.xml
@@ -158,7 +158,7 @@
 
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcpkix-jdk15on</artifactId>
+			<artifactId>bcpkix-jdk18on</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml
index 6969f5a5e43..b1b28d26182 100644
--- a/sormas-base/pom.xml
+++ b/sormas-base/pom.xml
@@ -34,7 +34,7 @@
 		<vaadin.version>8.14.3</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 		<swagger.version>2.2.15</swagger.version>
-		<bouncycastle.version>1.70</bouncycastle.version>
+		<bouncycastle.version>1.76</bouncycastle.version>
 		<grpc.version>1.56.1</grpc.version>
 		<keycloak.version>21.1.2</keycloak.version>
 		<netty.version>4.1.95.Final</netty.version>
@@ -733,19 +733,19 @@
 
 			<dependency>
 				<groupId>org.bouncycastle</groupId>
-				<artifactId>bcmail-jdk15on</artifactId>
+				<artifactId>bcmail-jdk18on</artifactId>
 				<version>${bouncycastle.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.bouncycastle</groupId>
-				<artifactId>bcpkix-jdk15on</artifactId>
+				<artifactId>bcpkix-jdk18on</artifactId>
 				<version>${bouncycastle.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.bouncycastle</groupId>
-				<artifactId>bcprov-jdk15on</artifactId>
+				<artifactId>bcprov-jdk18on</artifactId>
 				<version>${bouncycastle.version}</version>
 				<scope>provided</scope>
 			</dependency>
diff --git a/sormas-serverlibs/pom.xml b/sormas-serverlibs/pom.xml
index f07223d2f44..d57d1da0296 100644
--- a/sormas-serverlibs/pom.xml
+++ b/sormas-serverlibs/pom.xml
@@ -172,11 +172,11 @@
 
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcmail-jdk15on</artifactId>
+			<artifactId>bcmail-jdk18on</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcpkix-jdk15on</artifactId>
+			<artifactId>bcpkix-jdk18on</artifactId>
 		</dependency>
 
 		<dependency>
@@ -231,6 +231,18 @@
 		<dependency>
 			<groupId>org.keycloak</groupId>
 			<artifactId>keycloak-servlet-filter-adapter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.bouncycastle</groupId>
+					<artifactId>bcpkix-jdk15on</artifactId>
+					<!-- Use bcpkix-jdk18on -->
+				</exclusion>
+				<exclusion>
+					<groupId>org.bouncycastle</groupId>
+					<artifactId>bcprov-jdk15on</artifactId>
+					<!-- Use bcprov-jdk18on -->
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.keycloak</groupId>

From 4060248c041b100310f1165efa7e2bf7e01227c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=A9=20Strysewske?= <mate.strysewske@vitagroup.ag>
Date: Fri, 8 Sep 2023 09:05:02 +0200
Subject: [PATCH 3/3] [GITFLOW]updating poms for branch'hotfix-1.88.1' with
 non-snapshot versions

---
 sormas-api/pom.xml                       | 2 +-
 sormas-app/pom.xml                       | 2 +-
 sormas-backend/pom.xml                   | 2 +-
 sormas-base/pom.xml                      | 2 +-
 sormas-cargoserver/pom.xml               | 2 +-
 sormas-ear/pom.xml                       | 2 +-
 sormas-keycloak-service-provider/pom.xml | 2 +-
 sormas-rest/pom.xml                      | 2 +-
 sormas-serverlibs/pom.xml                | 2 +-
 sormas-ui/pom.xml                        | 2 +-
 sormas-widgetset/pom.xml                 | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml
index aa746a7d1ec..1cc518919b6 100644
--- a/sormas-api/pom.xml
+++ b/sormas-api/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.88.1-SNAPSHOT</version>
+		<version>1.88.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml
index 07fa3e66e1c..4764e003b58 100644
--- a/sormas-app/pom.xml
+++ b/sormas-app/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.88.1-SNAPSHOT</version>
+		<version>1.88.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml
index 6aaf11d9cef..7c56ffeacf8 100644
--- a/sormas-backend/pom.xml
+++ b/sormas-backend/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.88.1-SNAPSHOT</version>
+		<version>1.88.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml
index b1b28d26182..8da860de8c8 100644
--- a/sormas-base/pom.xml
+++ b/sormas-base/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>de.symeda.sormas</groupId>
 	<artifactId>sormas-base</artifactId>
 	<packaging>pom</packaging>
-	<version>1.88.1-SNAPSHOT</version>
+	<version>1.88.1</version>
 
 	<properties>
 		<maven.minimum.version>3.6.3</maven.minimum.version>
diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml
index 30c46dc1db2..4584e5533a2 100644
--- a/sormas-cargoserver/pom.xml
+++ b/sormas-cargoserver/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>de.symeda.sormas</groupId>
         <artifactId>sormas-base</artifactId>
-        <version>1.88.1-SNAPSHOT</version>
+        <version>1.88.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
 
diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml
index 6a64563b80e..053ab0c94b0 100644
--- a/sormas-ear/pom.xml
+++ b/sormas-ear/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.88.1-SNAPSHOT</version>
+		<version>1.88.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml
index 60e1fb5a002..2167937bab0 100644
--- a/sormas-keycloak-service-provider/pom.xml
+++ b/sormas-keycloak-service-provider/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.88.1-SNAPSHOT</version>
+		<version>1.88.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml
index 7c0031295f7..2a9272765bd 100644
--- a/sormas-rest/pom.xml
+++ b/sormas-rest/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.88.1-SNAPSHOT</version>
+		<version>1.88.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-serverlibs/pom.xml b/sormas-serverlibs/pom.xml
index d57d1da0296..0c3196c9a86 100644
--- a/sormas-serverlibs/pom.xml
+++ b/sormas-serverlibs/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.88.1-SNAPSHOT</version>
+		<version>1.88.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml
index bc28461b4fa..3fc9b6b6279 100644
--- a/sormas-ui/pom.xml
+++ b/sormas-ui/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.88.1-SNAPSHOT</version>
+		<version>1.88.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml
index db444473395..61597fc8d2a 100644
--- a/sormas-widgetset/pom.xml
+++ b/sormas-widgetset/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>1.88.1-SNAPSHOT</version>
+        <version>1.88.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>