From 4a9eef035683240ef68ffc4e7730f40b652b3a2c Mon Sep 17 00:00:00 2001
From: Damian Ujma <92095156+damianujma@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:19:06 +0200
Subject: [PATCH] ACS-8298 Bump bouncycastle, commons-io, poi, tika,
 apache-compress, xmlbeans (#2796)

* ACS-8298 Bump bouncycastle to 1.78.1

* ACS-8298 Bump tika

* ACS-8298 Bump commons-compress, xmlbeans

* ACS-8298 Bump commons-compress

* ACS-8298 Bump commons-io

* ACS-8298 Fix VirtualNodeServiceExtension

* ACS-8298 Bump commons-lang3
---
 data-model/pom.xml                               |  4 ----
 packaging/tests/tas-restapi/pom.xml              |  2 +-
 pom.xml                                          | 16 ++++++++--------
 repository/pom.xml                               |  4 ++--
 .../bundle/VirtualNodeServiceExtension.java      |  6 +++---
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/data-model/pom.xml b/data-model/pom.xml
index 7549aa6711..5eacebebed 100644
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -237,10 +237,6 @@
             <artifactId>tika-parsers-standard-package</artifactId>
             <version>${dependency.tika.version}</version>
             <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>asm</groupId>
                     <artifactId>asm</artifactId>
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index 21a0302fcb..44d1ed1076 100644
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -18,7 +18,7 @@
         <rest.api.explorer.branch>master</rest.api.explorer.branch>
         <httpclient-osgi-version>4.5.6</httpclient-osgi-version>
         <org.glassfish.version>1.1.4</org.glassfish.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
+        <commons-lang3.version>3.14.0</commons-lang3.version>
         <scribejava-apis.version>8.3.1</scribejava-apis.version>
         <license-maven-plugin.version>2.0.1.alfresco-2</license-maven-plugin.version>
         <java.version>11</java.version>
diff --git a/pom.xml b/pom.xml
index 6f196eebff..bdf35a7ff5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,12 +63,12 @@
         <dependency.cxf.version>3.5.5</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
         <dependency.webscripts.version>8.47</dependency.webscripts.version>
-        <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
+        <dependency.bouncycastle.version>1.78.1</dependency.bouncycastle.version>
         <dependency.mockito-core.version>4.9.0</dependency.mockito-core.version>
         <dependency.assertj.version>3.24.2</dependency.assertj.version>
         <dependency.org-json.version>20231013</dependency.org-json.version>
         <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>
-        <dependency.commons-io.version>2.11.0</dependency.commons-io.version>
+        <dependency.commons-io.version>2.16.1</dependency.commons-io.version>
         <dependency.gson.version>2.8.9</dependency.gson.version>
         <dependency.httpclient.version>4.5.13</dependency.httpclient.version>
         <dependency.httpcore.version>4.4.15</dependency.httpcore.version>
@@ -78,10 +78,10 @@
         <dependency.log4j.version>2.19.0</dependency.log4j.version>
         <dependency.gytheio.version>0.18</dependency.gytheio.version>
         <dependency.groovy.version>3.0.16</dependency.groovy.version>
-        <dependency.tika.version>2.4.1</dependency.tika.version>
+        <dependency.tika.version>2.9.2</dependency.tika.version>
         <dependency.spring-security.version>5.8.11</dependency.spring-security.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
-        <dependency.poi.version>5.2.2</dependency.poi.version>
+        <dependency.poi.version>5.2.5</dependency.poi.version>
         <dependency.poi-ooxml-lite.version>5.2.3</dependency.poi-ooxml-lite.version>
         <dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
         <dependency.camel.version>3.20.2</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
@@ -89,7 +89,7 @@
         <dependency.netty.qpid.version>4.1.82.Final</dependency.netty.qpid.version> <!-- must be in sync with camels transitive dependencies: native-unix-common/native-epoll/native-kqueue -->
         <dependency.netty-tcnative.version>2.0.56.Final</dependency.netty-tcnative.version> <!-- must be in sync with camels transitive dependencies -->
         <dependency.activemq.version>5.17.6</dependency.activemq.version>
-        <dependency.apache-compress.version>1.22</dependency.apache-compress.version>
+        <dependency.apache-compress.version>1.26.2</dependency.apache-compress.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
         <dependency.awaitility.version>4.2.0</dependency.awaitility.version>
         <dependency.swagger-ui.version>3.38.0</dependency.swagger-ui.version>
@@ -424,7 +424,7 @@
             <dependency>
                 <groupId>org.apache.xmlbeans</groupId>
                 <artifactId>xmlbeans</artifactId>
-                <version>5.1.1</version>
+                <version>5.2.1</version>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>
@@ -612,12 +612,12 @@
             <!-- Enforce newer version -->
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15on</artifactId>
+                <artifactId>bcprov-jdk18on</artifactId>
                 <version>${dependency.bouncycastle.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcmail-jdk15on</artifactId>
+                <artifactId>bcmail-jdk18on</artifactId>
                 <version>${dependency.bouncycastle.version}</version>
             </dependency>
             <dependency>
diff --git a/repository/pom.xml b/repository/pom.xml
index 6871c7d57e..d42cfc4d67 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.14.0</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
@@ -245,7 +245,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>net.sf</groupId>
diff --git a/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java
index 1cf368d1f1..bcf2381326 100644
--- a/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java
+++ b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java
@@ -26,8 +26,8 @@
 
 package org.alfresco.repo.virtual.bundle;
 
-import java.io.IOException;
 import java.io.Serializable;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -910,7 +910,7 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension<Node
 
             return result;
         }
-        catch (IOException e)
+        catch (UncheckedIOException e)
         {
             throw new VirtualizationException(e);
         }
@@ -968,7 +968,7 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension<Node
                 }
                 writer.putContent(text);
             }
-            catch (IOException e)
+            catch (UncheckedIOException e)
             {
                 throw new ActualEnvironmentException(e);
             }