From 75ed060bc2f1c0688424d474d6f4de811cbb5e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=A9=20Strysewske?= Date: Thu, 3 Nov 2022 09:10:24 +0100 Subject: [PATCH 1/4] [GITFLOW]updating poms for 1.76.2 branch with snapshot versions --- sormas-api/pom.xml | 2 +- sormas-app/pom.xml | 2 +- sormas-backend/pom.xml | 2 +- sormas-base/dependencies/serverlibs.pom | 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-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 ba1d7e92f45..0e6f8eb455f 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 1.76.1 + 1.76.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index 613eef5985d..7e91175547b 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.1 + 1.76.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index 78e556c10bd..252e63dcd9e 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.1 + 1.76.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 970cf096e36..895fe612537 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 1.76.1 + 1.76.2-SNAPSHOT ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index 81049818a0a..464ac47e788 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 1.76.1 + 1.76.2-SNAPSHOT 1.8 diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml index 388c5e4725b..d963aa90cb9 100644 --- a/sormas-cargoserver/pom.xml +++ b/sormas-cargoserver/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.1 + 1.76.2-SNAPSHOT ../sormas-base diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index 2c526f4171d..d9db618f9dc 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.1 + 1.76.2-SNAPSHOT ../sormas-base diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml index b808c67860c..bdfd9ba6939 100644 --- a/sormas-keycloak-service-provider/pom.xml +++ b/sormas-keycloak-service-provider/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.1 + 1.76.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index 43cf3db83c6..72d95293a0e 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.1 + 1.76.2-SNAPSHOT ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 0cea01d9bca..4c9cb836095 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.1 + 1.76.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index 4df03f54629..c48278a00cb 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.1 + 1.76.2-SNAPSHOT ../sormas-base 4.0.0 From 237a487ae575007bdb7b867a53279316b4c652d6 Mon Sep 17 00:00:00 2001 From: Christopher Riedel Date: Thu, 3 Nov 2022 09:14:30 +0100 Subject: [PATCH 2/4] fixed #10811 --- .../de/symeda/sormas/api/externaldata/ExternalDataDto.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 index 385518873bd..2eb0600c793 100644 --- 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,6 +17,8 @@ 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; @@ -24,7 +26,7 @@ import de.symeda.sormas.api.i18n.Validations; @AuditedClass -public class ExternalDataDto implements HasExternalData { +public class ExternalDataDto implements Serializable, HasExternalData { @AuditInclude private String uuid; From c9a64a202c3e02afe15f6adc0d4e4f37f714e726 Mon Sep 17 00:00:00 2001 From: Jonas Cirotzki Date: Thu, 3 Nov 2022 10:31:04 +0100 Subject: [PATCH 3/4] [#10823] bump commons-text to 1.10.0 in sormas-base and sormas-app --- sormas-app/app/build.gradle | 2 +- sormas-base/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sormas-app/app/build.gradle b/sormas-app/app/build.gradle index 23eaf02bde7..91b2a69926a 100644 --- 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-base/pom.xml b/sormas-base/pom.xml index 464ac47e788..1f1ff409a9b 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -431,7 +431,7 @@ org.apache.commons commons-text - 1.9 + 1.10.0 provided From a32e6d1a2dfcf3eb3e1416d56bc367e6900bb785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=A9=20Strysewske?= Date: Thu, 3 Nov 2022 14:18:03 +0100 Subject: [PATCH 4/4] [GITFLOW]updating poms for branch'hotfix-1.76.2' with non-snapshot versions --- sormas-api/pom.xml | 2 +- sormas-app/pom.xml | 2 +- sormas-backend/pom.xml | 2 +- sormas-base/dependencies/serverlibs.pom | 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-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 0e6f8eb455f..d7788c5d309 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 1.76.2-SNAPSHOT + 1.76.2 ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index 7e91175547b..04c93900427 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.2-SNAPSHOT + 1.76.2 ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index 252e63dcd9e..26a7a434cc9 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.2-SNAPSHOT + 1.76.2 ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 895fe612537..b2cc112f203 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 1.76.2-SNAPSHOT + 1.76.2 ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index 1f1ff409a9b..3b402e28d34 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 1.76.2-SNAPSHOT + 1.76.2 1.8 diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml index d963aa90cb9..101f5703873 100644 --- a/sormas-cargoserver/pom.xml +++ b/sormas-cargoserver/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.2-SNAPSHOT + 1.76.2 ../sormas-base diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index d9db618f9dc..2a23ba5bb7d 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.2-SNAPSHOT + 1.76.2 ../sormas-base diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml index bdfd9ba6939..1ed7b1c53db 100644 --- a/sormas-keycloak-service-provider/pom.xml +++ b/sormas-keycloak-service-provider/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.2-SNAPSHOT + 1.76.2 ../sormas-base 4.0.0 diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index 72d95293a0e..54dd80adcda 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.2-SNAPSHOT + 1.76.2 ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 4c9cb836095..3db8813561d 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.2-SNAPSHOT + 1.76.2 ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index c48278a00cb..576662d6b6b 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.2-SNAPSHOT + 1.76.2 ../sormas-base 4.0.0