Skip to content

Commit 1c7fe47

Browse files
MateStrysewskeMateStrysewske
committed
[GITFLOW]merging 'hotfix-1.88.1' into 'master'
2 parents 5d7565e + 4060248 commit 1c7fe47

File tree

11 files changed

+30
-18
lines changed

11 files changed

+30
-18
lines changed

‎sormas-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>de.symeda.sormas</groupId>
44
<artifactId>sormas-base</artifactId>
5-
<version>1.88.0</version>
5+
<version>1.88.1</version>
66
<relativePath>../sormas-base</relativePath>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>

‎sormas-app/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.88.0</version>
6+
<version>1.88.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎sormas-backend/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.88.0</version>
6+
<version>1.88.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
@@ -158,7 +158,7 @@
158158

159159
<dependency>
160160
<groupId>org.bouncycastle</groupId>
161-
<artifactId>bcpkix-jdk15on</artifactId>
161+
<artifactId>bcpkix-jdk18on</artifactId>
162162
</dependency>
163163

164164
<dependency>

‎sormas-base/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>de.symeda.sormas</groupId>
66
<artifactId>sormas-base</artifactId>
77
<packaging>pom</packaging>
8-
<version>1.88.0</version>
8+
<version>1.88.1</version>
99

1010
<properties>
1111
<maven.minimum.version>3.6.3</maven.minimum.version>
@@ -34,7 +34,7 @@
3434
<vaadin.version>8.14.3</vaadin.version>
3535
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
3636
<swagger.version>2.2.15</swagger.version>
37-
<bouncycastle.version>1.70</bouncycastle.version>
37+
<bouncycastle.version>1.76</bouncycastle.version>
3838
<grpc.version>1.56.1</grpc.version>
3939
<keycloak.version>21.1.2</keycloak.version>
4040
<netty.version>4.1.95.Final</netty.version>
@@ -733,19 +733,19 @@
733733

734734
<dependency>
735735
<groupId>org.bouncycastle</groupId>
736-
<artifactId>bcmail-jdk15on</artifactId>
736+
<artifactId>bcmail-jdk18on</artifactId>
737737
<version>${bouncycastle.version}</version>
738738
<scope>provided</scope>
739739
</dependency>
740740
<dependency>
741741
<groupId>org.bouncycastle</groupId>
742-
<artifactId>bcpkix-jdk15on</artifactId>
742+
<artifactId>bcpkix-jdk18on</artifactId>
743743
<version>${bouncycastle.version}</version>
744744
<scope>provided</scope>
745745
</dependency>
746746
<dependency>
747747
<groupId>org.bouncycastle</groupId>
748-
<artifactId>bcprov-jdk15on</artifactId>
748+
<artifactId>bcprov-jdk18on</artifactId>
749749
<version>${bouncycastle.version}</version>
750750
<scope>provided</scope>
751751
</dependency>

‎sormas-cargoserver/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>de.symeda.sormas</groupId>
55
<artifactId>sormas-base</artifactId>
6-
<version>1.88.0</version>
6+
<version>1.88.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99

‎sormas-ear/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>de.symeda.sormas</groupId>
55
<artifactId>sormas-base</artifactId>
6-
<version>1.88.0</version>
6+
<version>1.88.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99

‎sormas-keycloak-service-provider/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.88.0</version>
6+
<version>1.88.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎sormas-rest/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>de.symeda.sormas</groupId>
55
<artifactId>sormas-base</artifactId>
6-
<version>1.88.0</version>
6+
<version>1.88.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99

‎sormas-serverlibs/pom.xml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.88.0</version>
6+
<version>1.88.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
@@ -172,11 +172,11 @@
172172

173173
<dependency>
174174
<groupId>org.bouncycastle</groupId>
175-
<artifactId>bcmail-jdk15on</artifactId>
175+
<artifactId>bcmail-jdk18on</artifactId>
176176
</dependency>
177177
<dependency>
178178
<groupId>org.bouncycastle</groupId>
179-
<artifactId>bcpkix-jdk15on</artifactId>
179+
<artifactId>bcpkix-jdk18on</artifactId>
180180
</dependency>
181181

182182
<dependency>
@@ -231,6 +231,18 @@
231231
<dependency>
232232
<groupId>org.keycloak</groupId>
233233
<artifactId>keycloak-servlet-filter-adapter</artifactId>
234+
<exclusions>
235+
<exclusion>
236+
<groupId>org.bouncycastle</groupId>
237+
<artifactId>bcpkix-jdk15on</artifactId>
238+
<!-- Use bcpkix-jdk18on -->
239+
</exclusion>
240+
<exclusion>
241+
<groupId>org.bouncycastle</groupId>
242+
<artifactId>bcprov-jdk15on</artifactId>
243+
<!-- Use bcprov-jdk18on -->
244+
</exclusion>
245+
</exclusions>
234246
</dependency>
235247
<dependency>
236248
<groupId>org.keycloak</groupId>

‎sormas-ui/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.88.0</version>
6+
<version>1.88.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎sormas-widgetset/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.88.0</version>
6+
<version>1.88.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)