Skip to content

Commit

Permalink
ACS-8298 Bump bouncycastle, commons-io, poi, tika, apache-compress, x…
Browse files Browse the repository at this point in the history
…mlbeans (#2797) (#2804)

* ACS-8298 Bump bouncycastle, commons-lang3, commons-io, commons-compress, xmlbeans, tika, poi

* ACS-8298 Bump commons-compress to 1.26.2

* ACS-8298 Add commons-compress to tas-restapi

* ACS-8298 Exclude commons-lang3

* ACS-8298 Remove exclusion
  • Loading branch information
damianujma authored Jul 23, 2024
1 parent 3dd69ca commit 9ae7906
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 17 deletions.
4 changes: 0 additions & 4 deletions data-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions packaging/tests/tas-restapi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

<properties>
<suiteXmlFile>${project.basedir}/src/test/resources/restapi-suite.xml</suiteXmlFile>
<commons-lang3.version>3.14.0</commons-lang3.version>
</properties>

<profiles>
Expand All @@ -47,6 +48,11 @@
</profiles>

<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>org.alfresco.tas</groupId>
<artifactId>restapi</artifactId>
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
<dependency.cxf.version>3.5.5</dependency.cxf.version>
<dependency.opencmis.version>1.0.0</dependency.opencmis.version>
<dependency.webscripts.version>8.50</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.6.1</dependency.mockito-core.version>
<dependency.assertj.version>3.23.1</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.guava.version>33.1.0-jre</dependency.guava.version>
<dependency.httpclient.version>4.5.13</dependency.httpclient.version>
Expand All @@ -77,10 +77,10 @@
<dependency.slf4j.version>2.0.1</dependency.slf4j.version>
<dependency.gytheio.version>0.17</dependency.gytheio.version>
<dependency.groovy.version>3.0.12</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.keycloak.version>18.0.0</dependency.keycloak.version>
<dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
Expand All @@ -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.21</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>
Expand Down Expand Up @@ -419,7 +419,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>
Expand Down Expand Up @@ -618,12 +618,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>
Expand Down
4 changes: 2 additions & 2 deletions repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,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>
Expand Down Expand Up @@ -248,7 +248,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>net.sf</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -910,7 +910,7 @@ private List<AssociationRef> getDownloadTargetAssocs(NodeRef sourceNodeRef)

return result;
}
catch (IOException e)
catch (UncheckedIOException e)
{
throw new VirtualizationException(e);
}
Expand Down Expand Up @@ -968,7 +968,7 @@ private void createDownloadAssociation(NodeRef sourceNodeRef, NodeRef targetRef)
}
writer.putContent(text);
}
catch (IOException e)
catch (UncheckedIOException e)
{
throw new ActualEnvironmentException(e);
}
Expand Down

0 comments on commit 9ae7906

Please sign in to comment.