Merge branch 'main' into react-component-pro

vaadin · May 6, 2024 · ee4a58b · ee4a58b
2 parents 6ecff4c + eb987b3
commit ee4a58b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/scripts/generateAndCheckSBOM.js b/scripts/generateAndCheckSBOM.js
@@ -64,6 +64,10 @@ const cveWhiteList = {
   'pkg:npm/[email protected]' : {
     cves: ['CVE-2024-26467'],
     description: 'This is coming from the tools, @cyclonedx/cyclonedx-npm, we have used for sbom module, FP for us. '
+  },
+  'pkg:npm/[email protected]' : {
+    cves: ['CVE-2024-34394', 'CVE-2024-34393'],
+    description: 'This is coming from the tools, @cyclonedx/cyclonedx, we have used for sbom module, FP for us. '
   }
 }
 

diff --git a/versions.json b/versions.json
@@ -446,7 +446,7 @@
             "javaVersion": "24.4.0.beta1"
         },
         "kubernetes-kit-starter": {
-            "javaVersion": "2.2.1"
+            "javaVersion": "2.2.2"
         },
         "observability-kit-starter": {
             "javaVersion": "3.0.0.beta1",