From e80cf651a3049bd41d60412120fbeb6fa27de348 Mon Sep 17 00:00:00 2001 From: Stefan Kock Date: Mon, 21 Nov 2022 10:15:26 +0100 Subject: [PATCH 1/3] [GITFLOW]updating poms for 1.76.7 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 88cff8fa66e..e7f69c5c191 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 1.76.6 + 1.76.7-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index 910bf478487..78f7f067b60 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.6 + 1.76.7-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index 5057fa60613..903adf0b243 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.6 + 1.76.7-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 694ede37ef4..37a8f52195b 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 1.76.6 + 1.76.7-SNAPSHOT ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index 8816e831719..132b7e9d1d4 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 1.76.6 + 1.76.7-SNAPSHOT 1.8 diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml index 55ad221726f..cbba9f88bc5 100644 --- a/sormas-cargoserver/pom.xml +++ b/sormas-cargoserver/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.6 + 1.76.7-SNAPSHOT ../sormas-base diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index 36f4db1e2a8..5889a15976f 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.6 + 1.76.7-SNAPSHOT ../sormas-base diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml index b3b317ab941..551d0803e4a 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.6 + 1.76.7-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index d43cecf8213..a22265d0c11 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.6 + 1.76.7-SNAPSHOT ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index b0e4ef95bfa..de7809d19a4 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.6 + 1.76.7-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index 39caac88a4a..c11791f3f07 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.6 + 1.76.7-SNAPSHOT ../sormas-base 4.0.0 From 5f62d13523bd28384e2134e49971ee6f194c581d Mon Sep 17 00:00:00 2001 From: Stefan Kock Date: Mon, 21 Nov 2022 10:25:49 +0100 Subject: [PATCH 2/3] #10965 Fix transl. MRNA_BIVALENT_BA_4_5_MODERNA --- sormas-api/src/main/resources/enum.properties | 2 +- sormas-api/src/main/resources/enum_de-DE.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties index eff50e578b5..ad69812d8ac 100644 --- a/sormas-api/src/main/resources/enum.properties +++ b/sormas-api/src/main/resources/enum.properties @@ -1908,7 +1908,7 @@ Vaccine.MRNA_BIVALENT_BA_1_MODERNA=mRNA/bivalent BA.1 (Moderna) Vaccine.VALNEVA=inactivated (Valneva) Vaccine.NUVAXOVID=protein-based, recombinant (Novavax) Vaccine.MRNA_BIVALENT_BA_4_5_BIONTECH_PFIZER=mRNA/bivalent BA.4/5 (BioNTech/Pfizer) -Vaccine.MRNA_BIVALENT_BA_4_5_MODERNA=mRNA/bivalent BA.1 (Moderna) +Vaccine.MRNA_BIVALENT_BA_4_5_MODERNA=mRNA/bivalent BA.4/5 (Moderna) Vaccine.UNKNOWN=Unknown Vaccine.OTHER=Other diff --git a/sormas-api/src/main/resources/enum_de-DE.properties b/sormas-api/src/main/resources/enum_de-DE.properties index 3e2e3fdde51..a17bf9373f9 100644 --- a/sormas-api/src/main/resources/enum_de-DE.properties +++ b/sormas-api/src/main/resources/enum_de-DE.properties @@ -1908,7 +1908,7 @@ Vaccine.MRNA_BIVALENT_BA_1_MODERNA=mRNA/bivalent BA.1 (Moderna) Vaccine.VALNEVA=inaktiviert (Valneva) Vaccine.NUVAXOVID=proteinbasiert, rekombinant (Novavax) Vaccine.MRNA_BIVALENT_BA_4_5_BIONTECH_PFIZER=mRNA/bivalent BA.4/5 (BioNTech/Pfizer) -Vaccine.MRNA_BIVALENT_BA_4_5_MODERNA=mRNA/bivalent BA.1 (Moderna) +Vaccine.MRNA_BIVALENT_BA_4_5_MODERNA=mRNA/bivalent BA.4/5 (Moderna) Vaccine.UNKNOWN=Unbekannt Vaccine.OTHER=Sonstiges From da48e1c8aa1c06b86287a9277538b0cfb37eefe5 Mon Sep 17 00:00:00 2001 From: Stefan Kock Date: Mon, 21 Nov 2022 10:35:19 +0100 Subject: [PATCH 3/3] [GITFLOW]updating poms for branch'hotfix-1.76.7' 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 e7f69c5c191..3d40d3303be 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 1.76.7-SNAPSHOT + 1.76.7 ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index 78f7f067b60..9cc792843ce 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.7-SNAPSHOT + 1.76.7 ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index 903adf0b243..cedd23ac60a 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.7-SNAPSHOT + 1.76.7 ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 37a8f52195b..ece03ebf4d0 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 1.76.7-SNAPSHOT + 1.76.7 ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index 132b7e9d1d4..dd468f6989e 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 1.76.7-SNAPSHOT + 1.76.7 1.8 diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml index cbba9f88bc5..6b15067ae4f 100644 --- a/sormas-cargoserver/pom.xml +++ b/sormas-cargoserver/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.7-SNAPSHOT + 1.76.7 ../sormas-base diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index 5889a15976f..239b2bbf033 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.7-SNAPSHOT + 1.76.7 ../sormas-base diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml index 551d0803e4a..aadbfe850ea 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.7-SNAPSHOT + 1.76.7 ../sormas-base 4.0.0 diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index a22265d0c11..70aaf2340bb 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.76.7-SNAPSHOT + 1.76.7 ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index de7809d19a4..95924d15d12 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.7-SNAPSHOT + 1.76.7 ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index c11791f3f07..c2c775cc311 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.76.7-SNAPSHOT + 1.76.7 ../sormas-base 4.0.0