From 7a9c361c25f53be2d6becb3d0eabc4fb7cf4552c 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:47:06 +0200
Subject: [PATCH 1/3] [GITFLOW]updating poms for 1.87.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 040069f527e..13e30f016c9 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.87.0</version>
+		<version>1.87.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 9580c19161e..f1221ecd7ae 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.87.0</version>
+		<version>1.87.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 37fb63ca1c5..36b7dc5b53c 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.87.0</version>
+		<version>1.87.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 95f4f81d8fc..cfe9b4ae3be 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.87.0</version>
+	<version>1.87.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 317f521ad8b..69a087042cf 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.87.0</version>
+        <version>1.87.1-SNAPSHOT</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
 
diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml
index 504ca795ad1..16ae78f0e96 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.87.0</version>
+		<version>1.87.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 96ed1b75c73..bb009d160ce 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.87.0</version>
+		<version>1.87.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 4bf5bf94ea7..2237ad32521 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.87.0</version>
+		<version>1.87.1-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-serverlibs/pom.xml b/sormas-serverlibs/pom.xml
index 1e817f8b3ea..90bae8c4d06 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.87.0</version>
+		<version>1.87.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 60f04448bd5..523c7557e56 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.87.0</version>
+		<version>1.87.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 4cbe2bfe3d5..c25057f7d51 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.87.0</version>
+        <version>1.87.1-SNAPSHOT</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

From dc737608d0ac6cca56f47f209dbc4e8f589519b5 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 36b7dc5b53c..d6362fa752e 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 cfe9b4ae3be..58437fd3306 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 90bae8c4d06..c8acede7d78 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 ca3a09f400ef82656318788a4ec16271ea7a7189 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:54:06 +0200
Subject: [PATCH 3/3] [GITFLOW]updating poms for branch'hotfix-1.87.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 13e30f016c9..09ed975c15d 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.87.1-SNAPSHOT</version>
+		<version>1.87.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 f1221ecd7ae..8eb0bd9b12b 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.87.1-SNAPSHOT</version>
+		<version>1.87.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 d6362fa752e..eca8a537e42 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.87.1-SNAPSHOT</version>
+		<version>1.87.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 58437fd3306..9af6a80e869 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.87.1-SNAPSHOT</version>
+	<version>1.87.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 69a087042cf..1a4cdee4e81 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.87.1-SNAPSHOT</version>
+        <version>1.87.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
 
diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml
index 16ae78f0e96..00f491ae644 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.87.1-SNAPSHOT</version>
+		<version>1.87.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml
index bb009d160ce..d86c3753d9a 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.87.1-SNAPSHOT</version>
+		<version>1.87.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 2237ad32521..3fc68079efd 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.87.1-SNAPSHOT</version>
+		<version>1.87.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-serverlibs/pom.xml b/sormas-serverlibs/pom.xml
index c8acede7d78..8e62461362f 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.87.1-SNAPSHOT</version>
+		<version>1.87.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 523c7557e56..3d5697b3d2e 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.87.1-SNAPSHOT</version>
+		<version>1.87.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 c25057f7d51..b57808b5085 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.87.1-SNAPSHOT</version>
+        <version>1.87.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>