Merge pull request #186 from admin-ch/renovate/dependencies

admin-ch · Feb 22, 2023 · 7ac1467 · 7ac1467
2 parents c9b0883 + 3ea6b5d
commit 7ac1467
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-data/pom.xml b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-data/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.5.1</version>
+            <version>42.5.2</version>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>

diff --git a/...ovidcertificate-backend-verifier-ws/src/main/resources/valuesets/vaccine-prophylaxis.json b/...ovidcertificate-backend-verifier-ws/src/main/resources/valuesets/vaccine-prophylaxis.json
@@ -1,25 +1,25 @@
 {
   "valueSetId": "sct-vaccines-covid-19",
-  "valueSetDate": "2021-04-27",
+  "valueSetDate": "2023-01-25",
   "valueSetValues": {
-    "1119349007": {
-      "display": "SARS-CoV-2 mRNA vaccine",
+    "1119305005": {
+      "display": "SARS-CoV-2 antigen vaccine",
       "lang": "en",
       "active": true,
       "version": "http://snomed.info/sct/900000000000207008/version/20210131",
       "system": "http://snomed.info/sct"
     },
-    "1119305005": {
-      "display": "SARS-CoV-2 antigen vaccine",
+    "1119349007": {
+      "display": "SARS-CoV-2 mRNA vaccine",
       "lang": "en",
       "active": true,
       "version": "http://snomed.info/sct/900000000000207008/version/20210131",
       "system": "http://snomed.info/sct"
     },
     "J07BX03": {
-      "display": "covid-19 vaccines",
+      "display": "covid-19 vaccines (deprecated)",
       "lang": "en",
-      "active": true,
+      "active": false,
       "version": "2021-01",
       "system": "http://www.whocc.no/atc"
     },
@@ -43,6 +43,27 @@
       "active": true,
       "version": "2022-01-31",
       "system": "http://snomed.info/sct"
+    },
+    "28531000087107": {
+      "display": "COVID-19 vaccine",
+      "lang": "en",
+      "active": true,
+      "version": "2022-12-31",
+      "system": "http://snomed.info/sct"
+    },
+    "30141000087107": {
+      "display": "SARS-CoV-2 virus-like particle antigen vaccine",
+      "lang": "en",
+      "active": true,
+      "version": "2022-12-31",
+      "system": "http://snomed.info/sct"
+    },
+    "1187593009": {
+      "display": "SARS-CoV-2 DNA plasmid encoding spike protein vaccine",
+      "lang": "en",
+      "active": true,
+      "version": "2022-12-31",
+      "system": "http://snomed.info/sct"
     }
   }
-}
+}
diff --git a/...fier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/verifier/ws/EtagUtilTest.java b/...fier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/verifier/ws/EtagUtilTest.java
@@ -48,7 +48,7 @@ public void testFileHash() throws Exception {
 
     @Test
     public void testFileHashMultiple() throws Exception {
-        String expected = "W/\"fa28fe308acc9da12a2dbd3e9c4c53bcfffb89d0\"";
+        String expected = "W/\"0cf292022a5513b21aaa956d00759d5578f85caa\"";
         List<String> pathsToValueSets =
                 List.of(
                         "classpath:valuesets/test-manf.json",