This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch TIKA-3948 in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/TIKA-3948 by this push: new 012daad88 TIKA-3948 -- WIP -- still broken 012daad88 is described below commit 012daad8824753da39f603bfad72cab7d0b6ec41 Author: tallison <talli...@apache.org> AuthorDate: Wed Sep 13 16:19:28 2023 -0400 TIKA-3948 -- WIP -- still broken --- tika-parent/pom.xml | 30 +++++++++++----------- .../tika-parser-advancedmedia-module/pom.xml | 4 +-- .../tika-parsers-ml/tika-parser-nlp-module/pom.xml | 4 +-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml index 24c9ae7ed..611b0dc1c 100644 --- a/tika-parent/pom.xml +++ b/tika-parent/pom.xml @@ -340,11 +340,7 @@ <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> - <!-- updating jaxb to 3.0.2 brings convergence problems with modules that use cxf - which can be helped by excluding old versions jakarta.xml.bind, - but it turns out tika-parser-advancedmedia-module fails its tests, - because we need bind 2.3.3 for xmpbox, which uses javax.xml.bind --> - <jaxb.version>2.3.6</jaxb.version> + <jaxb.version>4.0.3</jaxb.version> <jbig2.version>3.0.4</jbig2.version> <jdom2.version>2.0.6.1</jdom2.version> <jempbox.version>1.8.17</jempbox.version> @@ -670,25 +666,29 @@ <version>8.5.12</version> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>${javax.annotation.version}</version> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + <version>2.1.2</version> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>2.1.1</version> </dependency> - <!-- can't upgrade higher until geoapi does because of changes in classes after 2.1 --> <dependency> <groupId>javax.measure</groupId> <artifactId>unit-api</artifactId> <version>2.1</version> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>${javax.rest.version}</version> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> + <version>3.1.0</version> </dependency> <dependency> - <groupId>javax.xml.soap</groupId> - <artifactId>javax.xml.soap-api</artifactId> - <version>1.4.0</version> + <groupId>jakarta.xml.soap</groupId> + <artifactId>jakarta.xml.soap-api</artifactId> + <version>3.0.0</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml index 953651407..afe5ce15d 100644 --- a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml +++ b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml @@ -60,8 +60,8 @@ <version>${openjson.version}</version> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml index 34327e839..806dc061c 100644 --- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml +++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml @@ -74,8 +74,8 @@ <artifactId>cxf-rt-rs-client</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId>