From 4b131110c7c67d30109771ed0ce9181c932bce94 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Thu, 31 Oct 2024 03:51:15 +0000
Subject: [PATCH] fix: dspace-api/pom.xml & pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-8186141
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-8186158
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-8186142
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-7569538
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHECOMMONS-6254296
- https://snyk.io/vuln/SNYK-JAVA-SOFTWAREAMAZONION-6153869
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHECOMMONS-6254297
- https://snyk.io/vuln/SNYK-JAVA-COMMONSCODEC-561518
---
 dspace-api/pom.xml | 2 +-
 pom.xml            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index c1811a9d63a1..c617eb5dc166 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -742,7 +742,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.12.261</version>
+            <version>1.12.777</version>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 3d9e6851d1d0..3cb719b27d33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,12 +37,12 @@
         <jaxb-runtime.version>2.3.1</jaxb-runtime.version>
         <jcache-version>1.1.0</jcache-version>
         <!-- NOTE: Jetty needed for Solr, Handle Server & tests -->
-        <jetty.version>9.4.48.v20220622</jetty.version>
+        <jetty.version>12.0.12</jetty.version>
         <log4j.version>2.17.1</log4j.version>
         <pdfbox-version>2.0.27</pdfbox-version>
         <rome.version>1.18.0</rome.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <tika.version>2.3.0</tika.version>
+        <tika.version>3.0.0</tika.version>
         <!-- Sync with whatever version Tika uses -->
         <bouncycastle.version>1.70</bouncycastle.version>
 
@@ -115,7 +115,7 @@
                             </goals>
                             <configuration>
                                 <rules>
-                                    <DependencyConvergence />
+                                    <DependencyConvergence/>
                                 </rules>
                             </configuration>
                         </execution>