[GITFLOW]merging 'hotfix-1.76.2' into 'master'

SORMAS-Foundation · Nov 3, 2022 · a2cd659 · a2cd659
2 parents df6204d + a32e6d1
commit a2cd659
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 14 deletions.
diff --git 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.76.1</version>
+		<version>1.76.2</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externaldata/ExternalDataDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/externaldata/ExternalDataDto.java
@@ -17,14 +17,16 @@
 
 import static de.symeda.sormas.api.utils.FieldConstraints.CHARACTER_LIMIT_DEFAULT;
 
+import java.io.Serializable;
+
 import javax.validation.constraints.Size;
 
 import de.symeda.sormas.api.audit.AuditInclude;
 import de.symeda.sormas.api.audit.AuditedClass;
 import de.symeda.sormas.api.i18n.Validations;
 
 @AuditedClass
-public class ExternalDataDto implements HasExternalData {
+public class ExternalDataDto implements Serializable, HasExternalData {
 
 	@AuditInclude
 	private String uuid;

diff --git a/sormas-app/app/build.gradle b/sormas-app/app/build.gradle
@@ -111,7 +111,7 @@ dependencies {
     implementation 'commons-logging:commons-logging:1.2'
     implementation 'org.apache.commons:commons-collections4:4.4'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
-    implementation 'org.apache.commons:commons-text:1.9'
+    implementation 'org.apache.commons:commons-text:1.10.0'
     implementation 'org.jsoup:jsoup:1.14.3'
     implementation 'com.googlecode:openbeans:1.0'
     implementation files('libs/MPAndroidChart-v3.0.2.jar')

diff --git 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.76.1</version>
+		<version>1.76.2</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git 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.76.1</version>
+		<version>1.76.2</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>1.76.1</version>
+        <version>1.76.2</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git 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.76.1</version>
+	<version>1.76.2</version>
 
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -431,7 +431,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-text</artifactId>
-				<version>1.9</version>
+				<version>1.10.0</version>
 				<scope>provided</scope>
 			</dependency>
 

diff --git 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.76.1</version>
+        <version>1.76.2</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
 

diff --git 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.76.1</version>
+		<version>1.76.2</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 

diff --git 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.76.1</version>
+		<version>1.76.2</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git 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.76.1</version>
+		<version>1.76.2</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 

diff --git 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.76.1</version>
+		<version>1.76.2</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git 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.76.1</version>
+        <version>1.76.2</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>