From 2eb124190f95fa16de37d28b5f2b41b34ce5cb83 Mon Sep 17 00:00:00 2001
From: Martin Schreier <martin_s@apache.org>
Date: Fri, 15 Apr 2022 23:12:56 +0200
Subject: [PATCH] Changing cassandra version

---
 .../META-INF/owasp/cve-suppressions.xml         | 17 +++++++++++++++++
 .../metadata-store-cassandra/pom.xml            |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/owasp/cve-suppressions.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/owasp/cve-suppressions.xml
index c18030118..60343be2a 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/owasp/cve-suppressions.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/owasp/cve-suppressions.xml
@@ -22,6 +22,23 @@
     <vulnerabilityName>CVE-2020-10673</vulnerabilityName>
   </suppress>
 
+  <suppress until="2022-04-20">
+    <notes><![CDATA[
+    Will be upgraded with the next push.
+   file name: metadata-store-cassandra-3.0.0-SNAPSHOT.jar
+   ]]></notes>
+    <packageUrl regex="true">^pkg:maven/org\.apache\.archiva/metadata\-store\-cassandra@.*$</packageUrl>
+    <cpe>cpe:/a:apache:archiva</cpe>
+  </suppress>
+
+  <suppress until="2022-04-20" >
+    <notes><![CDATA[
+   file name: metadata-store-cassandra-3.0.0-SNAPSHOT.jar
+   ]]></notes>
+    <packageUrl regex="true">^pkg:maven/org\.apache\.archiva/metadata\-store\-cassandra@.*$</packageUrl>
+    <cpe>cpe:/a:apache:cassandra</cpe>
+  </suppress>
+
   <suppress>
     <notes><![CDATA[
    False positive for oak-jcr packages
diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
index 0bd365661..4aee87311 100644
--- a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
@@ -31,8 +31,8 @@
 
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
-    <cassandraVersion>3.11.11</cassandraVersion>
-    <datastax.driver.version>4.13.0</datastax.driver.version>
+    <cassandraVersion>3.11.12</cassandraVersion>
+    <datastax.driver.version>4.14.0</datastax.driver.version>
   </properties>
 
   <dependencies>
-- 
2.39.5