This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_1x in repository https://gitbox.apache.org/repos/asf/tika.git
commit 90d8f5ad044fde6d23c7a34d2a689bf9c07bf73e Author: tallison <[email protected]> AuthorDate: Wed Dec 8 09:25:21 2021 -0500 TIKA-3613 -- general upgrades for 1.27.1 --- tika-batch/pom.xml | 4 ---- tika-parent/pom.xml | 14 +++++++------- tika-parsers/pom.xml | 18 ++++++++++++++---- .../apache/tika/parser/microsoft/WordParserTest.java | 8 ++++++++ tika-server/pom.xml | 8 +++++++- 5 files changed, 36 insertions(+), 16 deletions(-) diff --git a/tika-batch/pom.xml b/tika-batch/pom.xml index e0acefd..ba9fce1 100644 --- a/tika-batch/pom.xml +++ b/tika-batch/pom.xml @@ -34,10 +34,6 @@ <name>Apache Tika batch</name> <url>http://tika.apache.org/</url> - <properties> - <cli.version>1.4</cli.version> - </properties> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml index 2156eea..742aae3 100644 --- a/tika-parent/pom.xml +++ b/tika-parent/pom.xml @@ -335,26 +335,26 @@ <rat.version>0.13</rat.version> <!-- NOTE: sync tukaani version with commons-compress in tika-parsers --> <poi.version>4.1.2</poi.version> - <commons.compress.version>1.20</commons.compress.version> + <commons.compress.version>1.21</commons.compress.version> <commons.io.version>2.11.0</commons.io.version> <commons.lang3.version>3.12.0</commons.lang3.version> - <gson.version>2.8.7</gson.version> - <guava.version>30.1.1-jre</guava.version> + <gson.version>2.8.9</gson.version> + <guava.version>31.0.1-jre</guava.version> <osgi.core.version>6.0.0</osgi.core.version> - <cxf.version>3.4.4</cxf.version> + <cxf.version>3.4.5</cxf.version> <slf4j.version>1.7.30</slf4j.version> <log4j.version>1.2.17</log4j.version> - <jackson.version>2.12.3</jackson.version> + <jackson.version>2.13.0</jackson.version> <!-- when this is next upgraded, see if we can get rid of javax.activation dependency in tika-server. Until then, DO NOT go above 2.x unless you know what you're doing. See TIKA-3407 --> <jaxb.version>2.3.4</jaxb.version> - <cli.version>1.4</cli.version> + <cli.version>1.5.0</cli.version> <lucene.version>8.9.0</lucene.version> <mockito.version>3.11.2</mockito.version> - <opennlp.version>1.9.3</opennlp.version> + <opennlp.version>1.9.4</opennlp.version> </properties> <build> diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml index b440bda..0f612da 100644 --- a/tika-parsers/pom.xml +++ b/tika-parsers/pom.xml @@ -50,7 +50,7 @@ <pdfbox.version>2.0.24</pdfbox.version> <jempbox.version>1.8.16</jempbox.version> <netcdf-java.version>4.5.5</netcdf-java.version> - <sis.version>1.0</sis.version> + <sis.version>1.1</sis.version> <parso.version>2.0.14</parso.version> <!-- used by POI, PDFBox and Jackcess ...try to sync --> <bouncycastle.version>1.69</bouncycastle.version> @@ -94,7 +94,7 @@ <dependency> <groupId>com.fasterxml.woodstox</groupId> <artifactId>woodstox-core</artifactId> - <version>6.2.6</version> + <version>6.2.7</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -171,7 +171,7 @@ <dependency> <groupId>com.github.luben</groupId> <artifactId>zstd-jni</artifactId> - <version>1.5.0-2</version> + <version>1.5.0-4</version> <scope>provided</scope> </dependency> @@ -343,6 +343,10 @@ <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> </exclusion> + <exclusion> + <groupId>org.jdom</groupId> + <artifactId>jdom2</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -395,6 +399,12 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> @@ -519,7 +529,7 @@ <dependency> <groupId>org.jdom</groupId> <artifactId>jdom2</artifactId> - <version>2.0.6</version> + <version>2.0.6.1</version> </dependency> <dependency> <groupId>com.google.guava</groupId> diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java index e2d3554..42c4268 100644 --- a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java +++ b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java @@ -39,6 +39,7 @@ import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.RecursiveParserWrapper; +import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler; import org.apache.tika.sax.BodyContentHandler; import org.junit.Ignore; import org.junit.Test; @@ -47,6 +48,13 @@ import org.xml.sax.ContentHandler; public class WordParserTest extends TikaTest { @Test + public void testOneOff() throws Exception { + System.out.println(AbstractRecursiveParserWrapperHandler.CONTAINER_EXCEPTION); + + debug(getRecursiveMetadata("testWORD_various.doc")); + } + + @Test public void testWordParser() throws Exception { try (InputStream input = WordParserTest.class.getResourceAsStream( "/test-documents/testWORD.doc")) { diff --git a/tika-server/pom.xml b/tika-server/pom.xml index 006d7e8..3e5d66e 100644 --- a/tika-server/pom.xml +++ b/tika-server/pom.xml @@ -29,7 +29,7 @@ <url>http://tika.apache.org/</url> <properties> - <cxf.micrometer.version>1.7.1</cxf.micrometer.version> + <cxf.micrometer.version>1.8.1</cxf.micrometer.version> <micrometer-extras.version>0.2.2</micrometer-extras.version> </properties> @@ -76,6 +76,12 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId>
