Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/branch_2x' into branch_2x
Browse files Browse the repository at this point in the history
  • Loading branch information
@tballison
tballison committed Nov 17, 2023
2 parents d24c0b3 + a8c3879 commit b0a0423
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 37 deletions.
2 changes: 1 addition & 1 deletion tika-bundles/tika-bundle-standard/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>2.1.0</version>
<version>2.1.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 0 additions & 10 deletions tika-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,18 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>

<!-- Optional OSGi dependencies, used only when running within OSGi -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.core.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${osgi.compendium.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand All @@ -71,7 +68,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -83,31 +79,26 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit5.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit5.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -168,7 +159,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>${rat.version}</version>
<configuration>
<excludes>
<exclude>src/test/resources/org/apache/tika/**</exclude>
Expand Down
2 changes: 1 addition & 1 deletion tika-langdetect/tika-langdetect-optimaize/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>24.0.1</version>
<version>24.1.0</version>
</dependency>
<!-- test dependencies -->
<dependency>
Expand Down
58 changes: 33 additions & 25 deletions tika-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,43 +287,43 @@
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<project.build.outputTimestamp>1697538631</project.build.outputTimestamp>
<!-- plugin versions -->
<checkstyle.plugin.version>3.3.0</checkstyle.plugin.version>
<checkstyle.plugin.version>3.3.1</checkstyle.plugin.version>
<forbiddenapis.version>3.6</forbiddenapis.version>
<groovy.maven.version>2.1.1</groovy.maven.version>
<maven.antrun.version>3.1.0</maven.antrun.version>
<maven.assembly.version>3.6.0</maven.assembly.version>
<maven.bundle.version>5.1.9</maven.bundle.version>
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<maven.failsafe.version>3.1.2</maven.failsafe.version>
<maven.javadoc.version>3.6.0</maven.javadoc.version>
<maven.failsafe.version>3.2.2</maven.failsafe.version>
<maven.javadoc.version>3.6.2</maven.javadoc.version>
<maven.jar.version>3.3.0</maven.jar.version>
<maven.scr.version>1.26.4</maven.scr.version>
<maven.surefire.version>3.1.2</maven.surefire.version>
<maven.surefire.version>3.2.2</maven.surefire.version>
<maven.shade.version>3.5.1</maven.shade.version>
<!-- need above java 8 for 10.[0-2] -->
<puppycrawl.version>9.3</puppycrawl.version>
<rat.version>0.15</rat.version>

<!-- dependency versions -->
<google.cloud.version>2.28.0</google.cloud.version>
<aws.version>1.12.567</aws.version>
<google.cloud.version>2.29.1</google.cloud.version>
<aws.version>1.12.590</aws.version>
<!-- WARNING: when you upgrade asm make sure that you update the
OpCode in the initializer in org.apache.tika.parser.asm.XHTMLClassVisitor
See TIKA-2992.
-->
<asm.version>9.6</asm.version>
<boilerpipe.version>1.1.0</boilerpipe.version>
<!-- used by POI, PDFBox and Jackcess ...try to sync -->
<bouncycastle.version>1.76</bouncycastle.version>
<bouncycastle.version>1.77</bouncycastle.version>
<!-- NOTE: sync brotli version with commons-compress-->
<brotli.version>0.1.2</brotli.version>
<commons.cli.version>1.5.0</commons.cli.version>
<commons.cli.version>1.6.0</commons.cli.version>
<commons.codec.version>1.16.0</commons.codec.version>
<commons.collections4.version>4.4</commons.collections4.version>
<commons.compress.version>1.24.0</commons.compress.version>
<commons.compress.version>1.25.0</commons.compress.version>
<commons.csv.version>1.10.0</commons.csv.version>
<commons.exec.version>1.3</commons.exec.version>
<commons.io.version>2.14.0</commons.io.version>
<commons.io.version>2.15.0</commons.io.version>
<commons.lang3.version>3.13.0</commons.lang3.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.math3.version>3.6.1</commons.math3.version>
Expand All @@ -342,8 +342,8 @@
<!-- versions greater than 62.2 are not compatible with icu4j handler in lucene 8.11.1 -->
<icu4j.version>62.2</icu4j.version>
<imageio.version>1.4.0</imageio.version>
<jackrabbit.version>2.21.19</jackrabbit.version>
<jackson.version>2.15.3</jackson.version>
<jackrabbit.version>2.21.20</jackrabbit.version>
<jackson.version>2.16.0</jackson.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<javax.jcr.version>2.0</javax.jcr.version>
<javax.rest.version>2.1.1</javax.rest.version>
Expand All @@ -360,7 +360,7 @@
<jna.version>5.13.0</jna.version>
<json.simple.version>1.1.1</json.simple.version>
<junit4.version>4.13.2</junit4.version>
<junit5.version>5.10.0</junit5.version>
<junit5.version>5.10.1</junit5.version>
<junrar.version>7.5.5</junrar.version>
<libpst.version>0.9.3</libpst.version>
<log4j2.version>2.20.0</log4j2.version>
Expand All @@ -381,32 +381,32 @@
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<parso.version>2.0.14</parso.version>
<pax.exam.version>4.13.5</pax.exam.version>
<pdfbox.version>2.0.29</pdfbox.version>
<pdfbox.version>2.0.30</pdfbox.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
<poi.version>5.2.3</poi.version>
<quartz.version>2.3.2</quartz.version>
<reactor.netty.version>1.1.12</reactor.netty.version>
<reactor.netty.version>1.1.13</reactor.netty.version>
<rome.version>2.1.0</rome.version>
<scm.version>2.0.1</scm.version>
<sis.version>1.3</sis.version>
<slf4j.version>2.0.9</slf4j.version>
<solrj.version>8.11.2</solrj.version>
<!-- NOTE: Spring 6 requires jdk17 -->
<spring.version>5.3.30</spring.version>
<sqlite.version>3.43.0.0</sqlite.version>
<sqlite.version>3.43.2.2</sqlite.version>
<tagsoup.version>1.2.1</tagsoup.version>
<test.containers.version>1.19.1</test.containers.version>
<test.containers.version>1.19.2</test.containers.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parent-->
<tukaani.version>1.9</tukaani.version>
<twelvemonkeys.version>3.9.4</twelvemonkeys.version>
<twelvemonkeys.version>3.10.1</twelvemonkeys.version>
<uima.version>3.4.1</uima.version>
<uimafit.version>3.4.0</uimafit.version>
<vorbis.version>0.8</vorbis.version>
<xerces.version>2.12.2</xerces.version>
<xmpcore.version>6.1.11</xmpcore.version>
<zstd.version>1.5.5-6</zstd.version>
<kafka.version>3.6.0</kafka.version>
<netty.version>4.1.100.Final</netty.version>
<netty.version>4.1.101.Final</netty.version>
<snappy.java.version>1.1.10.5</snappy.java.version>
</properties>

Expand Down Expand Up @@ -483,12 +483,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.24.0</version>
<version>12.25.0</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.44.0</version>
<version>1.45.0</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -586,7 +586,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.24.3</version>
<version>3.25.1</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand Down Expand Up @@ -668,7 +668,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.5.11</version>
<version>3.6.0</version>
</dependency>
<dependency>
<groupId>io.projectreactor.netty</groupId>
Expand Down Expand Up @@ -769,7 +769,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jackrabbit-api</artifactId>
<version>1.56.0</version>
<version>1.58.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down Expand Up @@ -989,7 +989,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.16.1</version>
<version>2.16.2</version>
<configuration>
<generateBackupPoms>false</generateBackupPoms>
</configuration>
Expand Down Expand Up @@ -1061,6 +1061,14 @@
<artifactId>h2</artifactId>
<version>2.2.224</version>
</exclude>
<!-- CVE-2023-39913: Uima is used because ctakes is used in the
natural language process module. Serialization is only on data that is configured in
tika-config.xml. We don't think we'd be vulnerable to crafted user input. -->
<coordinate>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
<version>3.4.1</version>
</coordinate>
</excludeCoordinates>
<fail>true</fail>
</configuration>
Expand Down

0 comments on commit b0a0423

Please sign in to comment.