From ff26b2c9c7dde9ea6e3494e28012f97830159b5a Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Tue, 17 Oct 2023 02:15:17 +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-COMMONSCODEC-561518
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-5902998
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-5958847
- https://snyk.io/vuln/SNYK-JAVA-ORGJSON-5962464
---
 dspace-api/pom.xml | 4 ++--
 pom.xml            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index c1811a9d63a1..e52ecaadb0f3 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.567</version>
         </dependency>
 
         <dependency>
@@ -776,7 +776,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20230227</version>
+            <version>20231013</version>
         </dependency>
 
         <!-- Useful for testing command-line tools -->
diff --git a/pom.xml b/pom.xml
index 3d9e6851d1d0..ee800c5afbf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <hibernate.version>5.6.5.Final</hibernate.version>
         <hibernate-validator.version>6.0.23.Final</hibernate-validator.version>
         <postgresql.driver.version>42.4.3</postgresql.driver.version>
-        <solr.client.version>8.11.1</solr.client.version>
+        <solr.client.version>9.4.0</solr.client.version>
 
         <ehcache.version>3.4.0</ehcache.version>
         <errorprone.version>2.10.0</errorprone.version>
@@ -115,7 +115,7 @@
                             </goals>
                             <configuration>
                                 <rules>
-                                    <DependencyConvergence />
+                                    <DependencyConvergence/>
                                 </rules>
                             </configuration>
                         </execution>