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 25c9fac9d [TIKA-3948] start mooving to Jakarta (#1337) 25c9fac9d is described below commit 25c9fac9d3ba0d544827f0fd60f21823e313bb68 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Thu Sep 14 21:55:14 2023 +0700 [TIKA-3948] start mooving to Jakarta (#1337) --- tika-bundles/tika-bundle-standard/pom.xml | 27 ++++++++++----------- .../test/java/org/apache/tika/bundle/BundleIT.java | 2 +- .../langdetect/lingo24/Lingo24LangDetector.java | 6 ++--- .../tika/langdetect/mitll/TextLangDetector.java | 2 +- tika-parent/pom.xml | 6 ++--- .../tika-parser-scientific-module/pom.xml | 20 ++++++++++++++++ .../tf/TensorflowRESTVideoRecogniser.java | 2 +- .../tika/parser/journal/GrobidRESTParser.java | 4 ++-- .../tika/parser/ner/grobid/GrobidNERecogniser.java | 4 ++-- .../tika/parser/ner/nltk/NLTKNERecogniser.java | 4 ++-- .../tika/parser/indesign/IDMLParserTest.java | 3 +++ .../server/core/CompositeParseContextConfig.java | 2 +- .../server/core/DefaultInputStreamFactory.java | 4 ++-- .../tika/server/core/FetcherStreamFactory.java | 6 ++--- .../tika/server/core/InputStreamFactory.java | 4 ++-- .../tika/server/core/ParseContextConfig.java | 2 +- .../server/core/ProduceTypeResourceComparator.java | 2 +- .../apache/tika/server/core/TikaLoggingFilter.java | 8 +++---- .../tika/server/core/TikaServerParseException.java | 2 +- .../core/TikaServerParseExceptionMapper.java | 8 +++---- .../server/core/config/DocumentSelectorConfig.java | 2 +- .../server/core/config/PasswordProviderConfig.java | 2 +- .../tika/server/core/config/TimeoutConfig.java | 2 +- .../tika/server/core/resource/AsyncResource.java | 14 +++++------ .../server/core/resource/DetectorResource.java | 14 +++++------ .../server/core/resource/LanguageResource.java | 10 ++++---- .../server/core/resource/MetadataResource.java | 22 ++++++++--------- .../tika/server/core/resource/PipesResource.java | 12 +++++----- .../core/resource/RecursiveMetadataResource.java | 24 +++++++++---------- .../tika/server/core/resource/TikaDetectors.java | 6 ++--- .../tika/server/core/resource/TikaMimeTypes.java | 10 ++++---- .../tika/server/core/resource/TikaParsers.java | 6 ++--- .../tika/server/core/resource/TikaResource.java | 28 +++++++++++----------- .../server/core/resource/TikaServerStatus.java | 6 ++--- .../tika/server/core/resource/TikaVersion.java | 6 ++--- .../tika/server/core/resource/TikaWelcome.java | 16 ++++++------- .../server/core/resource/TranslateResource.java | 12 +++++----- .../server/core/resource/UnpackerResource.java | 16 ++++++------- .../server/core/writer/CSVMessageBodyWriter.java | 12 +++++----- .../server/core/writer/JSONMessageBodyWriter.java | 12 +++++----- .../tika/server/core/writer/JSONObjWriter.java | 12 +++++----- .../core/writer/MetadataListMessageBodyWriter.java | 12 +++++----- .../apache/tika/server/core/writer/TarWriter.java | 12 +++++----- .../server/core/writer/TextMessageBodyWriter.java | 12 +++++----- .../tika/server/core/writer/TikaServerWriter.java | 2 +- .../apache/tika/server/core/writer/ZipWriter.java | 12 +++++----- .../tika/server/core/IntegrationTestBase.java | 2 +- .../tika/server/core/LanguageResourceTest.java | 2 +- .../server/core/RecursiveMetadataResourceTest.java | 2 +- .../apache/tika/server/core/StackTraceOffTest.java | 4 ++-- .../apache/tika/server/core/StackTraceTest.java | 4 ++-- .../apache/tika/server/core/TikaMimeTypesTest.java | 2 +- .../org/apache/tika/server/core/TikaPipesTest.java | 2 +- .../tika/server/core/TikaResourceFetcherTest.java | 6 ++--- .../core/TikaResourceMetadataFilterTest.java | 2 +- .../tika/server/core/TikaResourceNoStackTest.java | 2 +- .../apache/tika/server/core/TikaResourceTest.java | 6 ++--- .../core/TikaServerAsyncIntegrationTest.java | 2 +- .../server/core/TikaServerIntegrationTest.java | 4 ++-- .../core/TikaServerPipesIntegrationTest.java | 4 ++-- .../tika/server/core/TikaServerStatusTest.java | 2 +- .../apache/tika/server/core/TikaVersionTest.java | 2 +- .../apache/tika/server/core/TikaWelcomeTest.java | 2 +- .../tika/server/core/TranslateResourceTest.java | 2 +- .../apache/tika/server/eval/TikaEvalResource.java | 8 +++---- .../tika/server/eval/TikaEvalResourceTest.java | 2 +- tika-server/tika-server-standard/pom.xml | 2 +- .../server/standard/config/PDFServerConfig.java | 2 +- .../standard/config/TesseractServerConfig.java | 2 +- .../standard/resource/XMPMetadataResource.java | 20 ++++++++-------- .../standard/writer/XMPMessageBodyWriter.java | 10 ++++---- .../tika/server/standard/DetectorResourceTest.java | 2 +- .../apache/tika/server/standard/FetcherTest.java | 2 +- .../tika/server/standard/MetadataResourceTest.java | 4 ++-- .../server/standard/OpenNLPMetadataFilterTest.java | 2 +- .../standard/OptimaizeMetadataFilterTest.java | 2 +- .../standard/RecursiveMetadataFilterTest.java | 2 +- .../standard/RecursiveMetadataResourceTest.java | 6 ++--- .../tika/server/standard/TikaDetectorsTest.java | 2 +- .../tika/server/standard/TikaMimeTypesTest.java | 2 +- .../tika/server/standard/TikaParsersTest.java | 2 +- .../apache/tika/server/standard/TikaPipesTest.java | 2 +- .../tika/server/standard/TikaResourceTest.java | 6 ++--- .../tika/server/standard/UnpackerResourceTest.java | 2 +- .../standard/UnpackerResourceWithConfigTest.java | 2 +- .../language/translate/impl/GoogleTranslator.java | 4 ++-- .../translate/impl/JoshuaNetworkTranslator.java | 4 ++-- .../language/translate/impl/Lingo24Translator.java | 4 ++-- .../language/translate/impl/RTGTranslator.java | 4 ++-- .../language/translate/impl/YandexTranslator.java | 4 ++-- 90 files changed, 294 insertions(+), 274 deletions(-) diff --git a/tika-bundles/tika-bundle-standard/pom.xml b/tika-bundles/tika-bundle-standard/pom.xml index db605c044..8073297a4 100644 --- a/tika-bundles/tika-bundle-standard/pom.xml +++ b/tika-bundles/tika-bundle-standard/pom.xml @@ -98,9 +98,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + <version>2.0.1</version> <scope>test</scope> </dependency> <dependency> @@ -122,9 +122,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.activation</groupId> - <artifactId>javax.activation</artifactId> - <version>1.2.0</version> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> </dependency> <dependency> <groupId>com.sun.xml.fastinfoset</groupId> @@ -150,7 +149,7 @@ org.apache.tika.parser.internal.Activator </Bundle-Activator> <Embed-Dependency>*;scope=compile;artifactId=tika-parsers-standard-package| - javax.activation| + jakarta.activation| xerces| xercesImpl| commons-compress| @@ -167,10 +166,10 @@ fontbox| jempbox| xmpbox| - bcmail-jdk15on| - bcprov-jdk15on| - bcpkix-jdk15on| - bcutil-jdk15on| + bcjmail-jdk18on| + bcprov-jdk18on| + bcpkix-jdk18on| + bcutil-jdk18on| poi| poi-scratchpad| poi-ooxml| @@ -256,7 +255,7 @@ com.sun.tools.javadoc;resolution:=optional, de.rototor.pdfbox.graphics2d;resolution:=optional, icc;resolution:=optional, - javax.annotation;resolution:=optional, + jakarta.annotation;resolution:=optional, javax.mail;resolution:=optional, javax.mail.internet;resolution:=optional, javax.net.ssl;resolution:=optional, @@ -264,7 +263,7 @@ javax.servlet.annotation;resolution:=optional, javax.servlet.http;resolution:=optional, javax.measure.converter;resolution:=optional, - javax.ws.rs.core;resolution:=optional, + jakarta.ws.rs.core;resolution:=optional, javax.xml.bind;resolution:=optional, javax.xml.bind.annotation;resolution:=optional, javax.xml.bind.annotation.adapters;resolution:=optional, @@ -447,5 +446,3 @@ <tag>2.2.1-rc2</tag> </scm> </project> - - diff --git a/tika-bundles/tika-bundle-standard/src/test/java/org/apache/tika/bundle/BundleIT.java b/tika-bundles/tika-bundle-standard/src/test/java/org/apache/tika/bundle/BundleIT.java index 340b1ba17..4900ad76b 100644 --- a/tika-bundles/tika-bundle-standard/src/test/java/org/apache/tika/bundle/BundleIT.java +++ b/tika-bundles/tika-bundle-standard/src/test/java/org/apache/tika/bundle/BundleIT.java @@ -41,7 +41,7 @@ import java.util.Set; import java.util.jar.Attributes; import java.util.jar.JarInputStream; import java.util.jar.Manifest; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.Ignore; import org.junit.Test; diff --git a/tika-langdetect/tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetector.java b/tika-langdetect/tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetector.java index cf6aded15..17c816521 100644 --- a/tika-langdetect/tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetector.java +++ b/tika-langdetect/tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetector.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/tika-langdetect/tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll/TextLangDetector.java b/tika-langdetect/tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll/TextLangDetector.java index 1c439cd95..eebde7e4c 100644 --- a/tika-langdetect/tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll/TextLangDetector.java +++ b/tika-langdetect/tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll/TextLangDetector.java @@ -23,7 +23,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml index 611b0dc1c..19741061a 100644 --- a/tika-parent/pom.xml +++ b/tika-parent/pom.xml @@ -337,7 +337,7 @@ <imageio.version>1.4.0</imageio.version> <jackrabbit.version>2.21.19</jackrabbit.version> <jackson.version>2.15.2</jackson.version> - <javax.annotation.version>1.3.2</javax.annotation.version> + <jakarta.annotation.version>2.1.1</jakarta.annotation.version> <javax.jcr.version>2.0</javax.jcr.version> <javax.rest.version>2.1.1</javax.rest.version> <jaxb.version>4.0.3</jaxb.version> @@ -673,7 +673,7 @@ <dependency> <groupId>jakarta.annotation</groupId> <artifactId>jakarta.annotation-api</artifactId> - <version>2.1.1</version> + <version>${jakarta.annotation.version}</version> </dependency> <dependency> <groupId>javax.measure</groupId> @@ -997,7 +997,7 @@ <artifactId>guava</artifactId> <version>32.0.0-jre</version> </exclude> - <!-- sonatype https://ossindex.sonatype.org/vulnerability/sonatype-2021-0818 + <!-- sonatype https://ossindex.sonatype.org/vulnerability/sonatype-2021-0818 false positive? related bug https://github.com/grpc/grpc-java/issues/8311 has been fixed --> <dependency> diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml index 42fc28c64..b88ab4b46 100644 --- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml +++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml @@ -44,11 +44,31 @@ <groupId>org.apache.sis.storage</groupId> <artifactId>sis-netcdf</artifactId> <version>${sis.version}</version> + <exclusions> + <exclusion> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <!-- brings 2.3.3 --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.sis.core</groupId> <artifactId>sis-metadata</artifactId> <version>${sis.version}</version> + <exclusions> + <exclusion> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <!-- brings 2.3.3 --> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> + <!-- Old API required by org.apache.sis --> </dependency> <dependency> <groupId>org.opengis</groupId> diff --git a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java index f42145d2a..6d16cbe9d 100644 --- a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java +++ b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.Locale; import java.util.Map; import java.util.Set; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java index d7aedd660..737b22d5a 100644 --- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java +++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java @@ -22,8 +22,8 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.util.Properties; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.ext.multipart.Attachment; diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java index 1812b4b82..a2186da62 100644 --- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java +++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java @@ -22,8 +22,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.WebClient; import org.json.simple.JSONArray; diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java index 813ff986b..2729938ba 100644 --- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java +++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java @@ -24,8 +24,8 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.WebClient; import org.json.simple.JSONObject; diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/indesign/IDMLParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/indesign/IDMLParserTest.java index 4fe7b7351..e52dff095 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/indesign/IDMLParserTest.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/indesign/IDMLParserTest.java @@ -19,6 +19,7 @@ package org.apache.tika.parser.indesign; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.apache.tika.TikaTest; @@ -38,6 +39,7 @@ public class IDMLParserTest extends TikaTest { private final Parser parser = new IDMLParser(); //TODO PDFBOX30 xmp related stuff fails with PDFBox 3.0, see PDFBOX-5649 + @Disabled("TODO PDFBOX30 xmp related stuff fails with PDFBox 3.0, see PDFBOX-5649") @Test public void testParserToText() throws Exception { Metadata metadata = new Metadata(); @@ -55,6 +57,7 @@ public class IDMLParserTest extends TikaTest { } //TODO PDFBOX30 xmp related stuff fails with PDFBox 3.0, see PDFBOX-5649 + @Disabled("TODO PDFBOX30 xmp related stuff fails with PDFBox 3.0, see PDFBOX-5649") @Test public void testParserToXML() throws Exception { Metadata metadata = new Metadata(); diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/CompositeParseContextConfig.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/CompositeParseContextConfig.java index 29c8d75e4..6250352ce 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/CompositeParseContextConfig.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/CompositeParseContextConfig.java @@ -17,7 +17,7 @@ package org.apache.tika.server.core; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tika.config.ServiceLoader; import org.apache.tika.metadata.Metadata; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java index 4b6e399be..25c9aa9fb 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java @@ -19,8 +19,8 @@ package org.apache.tika.server.core; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.apache.tika.metadata.Metadata; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java index eb9188f51..aecd47edc 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java @@ -21,9 +21,9 @@ import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java index a1f65c4b2..b3b8c602c 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java @@ -19,8 +19,8 @@ package org.apache.tika.server.core; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.apache.tika.metadata.Metadata; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ParseContextConfig.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ParseContextConfig.java index 97f9b8271..1ed656c39 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ParseContextConfig.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ParseContextConfig.java @@ -32,7 +32,7 @@ */ package org.apache.tika.server.core; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.ParseContext; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ProduceTypeResourceComparator.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ProduceTypeResourceComparator.java index 2d2e594e8..56dcab443 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ProduceTypeResourceComparator.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ProduceTypeResourceComparator.java @@ -19,7 +19,7 @@ package org.apache.tika.server.core; import java.util.Arrays; import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.ResourceComparator; import org.apache.cxf.jaxrs.model.ClassResourceInfo; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaLoggingFilter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaLoggingFilter.java index 206e2977b..5c381c05f 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaLoggingFilter.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaLoggingFilter.java @@ -18,10 +18,10 @@ package org.apache.tika.server.core; import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.ext.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseException.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseException.java index a3cea1950..ad22cfba1 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseException.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseException.java @@ -16,7 +16,7 @@ */ package org.apache.tika.server.core; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.WebApplicationException; /** * Simple wrapper exception to be thrown for consistent handling diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseExceptionMapper.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseExceptionMapper.java index 18a829ad9..bcf2e0f3b 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseExceptionMapper.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseExceptionMapper.java @@ -21,10 +21,10 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.io.Writer; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.apache.tika.exception.EncryptedDocumentException; import org.apache.tika.exception.TikaException; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/DocumentSelectorConfig.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/DocumentSelectorConfig.java index 5b42effd3..22f73d405 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/DocumentSelectorConfig.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/DocumentSelectorConfig.java @@ -16,7 +16,7 @@ */ package org.apache.tika.server.core.config; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.commons.lang3.StringUtils; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/PasswordProviderConfig.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/PasswordProviderConfig.java index ca0d128a9..8feba8f26 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/PasswordProviderConfig.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/PasswordProviderConfig.java @@ -18,7 +18,7 @@ package org.apache.tika.server.core.config; import static java.nio.charset.StandardCharsets.UTF_8; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.commons.codec.binary.Base64; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/TimeoutConfig.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/TimeoutConfig.java index 9954b3760..6882f404a 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/TimeoutConfig.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/TimeoutConfig.java @@ -16,7 +16,7 @@ */ package org.apache.tika.server.core.config; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tika.config.TikaTaskTimeout; import org.apache.tika.metadata.Metadata; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/AsyncResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/AsyncResource.java index 172c8c67c..a26e9fc9c 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/AsyncResource.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/AsyncResource.java @@ -27,13 +27,13 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.concurrent.ArrayBlockingQueue; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/DetectorResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/DetectorResource.java index 417db0a14..bb3495659 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/DetectorResource.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/DetectorResource.java @@ -19,13 +19,13 @@ package org.apache.tika.server.core.resource; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/LanguageResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/LanguageResource.java index 6726add89..a52cffcf9 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/LanguageResource.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/LanguageResource.java @@ -21,11 +21,11 @@ import static java.nio.charset.StandardCharsets.UTF_8; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/MetadataResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/MetadataResource.java index 00f88426d..e0316ee1e 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/MetadataResource.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/MetadataResource.java @@ -22,17 +22,17 @@ import static org.apache.tika.server.core.resource.TikaResource.fillParseContext import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.slf4j.Logger; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/PipesResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/PipesResource.java index cc7be06b9..4c87bed35 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/PipesResource.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/PipesResource.java @@ -24,12 +24,12 @@ import java.io.Reader; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/RecursiveMetadataResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/RecursiveMetadataResource.java index ac4837110..93aa63f1b 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/RecursiveMetadataResource.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/RecursiveMetadataResource.java @@ -22,18 +22,18 @@ import static org.apache.tika.server.core.resource.TikaResource.fillParseContext import java.io.InputStream; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.slf4j.Logger; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaDetectors.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaDetectors.java index 86ab73301..ba42a4b8b 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaDetectors.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaDetectors.java @@ -21,9 +21,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaMimeTypes.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaMimeTypes.java index 15d034f1c..41b99bf03 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaMimeTypes.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaMimeTypes.java @@ -24,11 +24,11 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaParsers.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaParsers.java index 8c43037b8..6d664c305 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaParsers.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaParsers.java @@ -25,9 +25,9 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java index aadf86f30..90f033b43 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java @@ -32,20 +32,20 @@ import java.util.Locale; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.core.UriInfo; import javax.xml.transform.OutputKeys; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.sax.SAXTransformerFactory; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaServerStatus.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaServerStatus.java index 3c463e552..54fba86d3 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaServerStatus.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaServerStatus.java @@ -18,9 +18,9 @@ package org.apache.tika.server.core.resource; import java.util.LinkedHashMap; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.apache.tika.server.core.ServerStatus; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaVersion.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaVersion.java index 664ed7e0f..c894c2a88 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaVersion.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaVersion.java @@ -16,9 +16,9 @@ */ package org.apache.tika.server.core.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.apache.tika.Tika; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaWelcome.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaWelcome.java index d895e3e33..543cc4dd3 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaWelcome.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaWelcome.java @@ -28,14 +28,14 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.apache.cxf.jaxrs.lifecycle.ResourceProvider; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TranslateResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TranslateResource.java index 05d7443e7..b7f33a0f6 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TranslateResource.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TranslateResource.java @@ -22,12 +22,12 @@ import static java.nio.charset.StandardCharsets.UTF_8; import java.io.IOException; import java.io.InputStream; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java index 6f4bf93c0..b3d6e92d4 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java @@ -30,14 +30,14 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/CSVMessageBodyWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/CSVMessageBodyWriter.java index a3884a53b..e05e2be5c 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/CSVMessageBodyWriter.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/CSVMessageBodyWriter.java @@ -26,12 +26,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Arrays; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java index 965970fe9..695c58a00 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java @@ -25,12 +25,12 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.serialization.JsonMetadata; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java index 2cc7d17bb..d0a5df44c 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java @@ -26,12 +26,12 @@ import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Map; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java index a558cd122..59f77d44d 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java @@ -25,12 +25,12 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.apache.tika.metadata.serialization.JsonMetadataList; import org.apache.tika.server.core.MetadataList; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TarWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TarWriter.java index dcd258c6c..3972afe16 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TarWriter.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TarWriter.java @@ -22,12 +22,12 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Map; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TextMessageBodyWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TextMessageBodyWriter.java index c854c85e9..e923cec1a 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TextMessageBodyWriter.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TextMessageBodyWriter.java @@ -25,12 +25,12 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.apache.tika.metadata.Metadata; diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TikaServerWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TikaServerWriter.java index f01b47632..55a9de72f 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TikaServerWriter.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TikaServerWriter.java @@ -16,7 +16,7 @@ */ package org.apache.tika.server.core.writer; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.MessageBodyWriter; /** * Stub interface to allow for SPI loading from other modules diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/ZipWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/ZipWriter.java index 267565b9a..9e637dc07 100644 --- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/ZipWriter.java +++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/ZipWriter.java @@ -27,12 +27,12 @@ import java.util.zip.CRC32; import java.util.zip.ZipEntry; import java.util.zip.ZipException; import java.util.zip.ZipOutputStream; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java index af664259f..ad22b7cc9 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java @@ -27,7 +27,7 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java index 3da7f5094..03098734f 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java index 733aaa228..370aecbc7 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java @@ -25,7 +25,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java index 57b99c262..84d563d0e 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java @@ -22,8 +22,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java index 8811f4884..ebe7c37d0 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java @@ -23,8 +23,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java index 113a0f841..6fe5ec1be 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java @@ -18,7 +18,7 @@ package org.apache.tika.server.core; import java.io.InputStream; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java index 78ab70f40..e91754f24 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java @@ -34,7 +34,7 @@ import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java index b3ee5eafe..7f4b2fcbc 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java @@ -25,9 +25,9 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java index 816cc0a5c..7155baccb 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java @@ -25,7 +25,7 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java index d0f4c622e..6b7896029 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java @@ -25,7 +25,7 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java index 82474b38a..68195b87b 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java @@ -25,9 +25,9 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.apache.cxf.attachment.AttachmentUtil; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java index 33c1bc530..3542c863f 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java @@ -30,7 +30,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Random; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java index 6eebd92cc..d02084cd6 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java @@ -34,8 +34,8 @@ import java.util.List; import java.util.Random; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java index 36937e0c6..1fab6f1fb 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java @@ -28,8 +28,8 @@ import java.io.InputStreamReader; import java.io.Reader; import java.nio.file.Files; import java.nio.file.Path; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java index 217b47bf8..9579b5536 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java @@ -23,7 +23,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java index e4e623fd3..67d9cc6ea 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java @@ -20,7 +20,7 @@ package org.apache.tika.server.core; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.InputStream; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java index 590080116..42252dfbc 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java @@ -20,7 +20,7 @@ package org.apache.tika.server.core; import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java index f54a8373b..188d47e3e 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-eval/src/main/java/org/apache/tika/server/eval/TikaEvalResource.java b/tika-server/tika-server-eval/src/main/java/org/apache/tika/server/eval/TikaEvalResource.java index 67d1fb215..d0ece4ae9 100644 --- a/tika-server/tika-server-eval/src/main/java/org/apache/tika/server/eval/TikaEvalResource.java +++ b/tika-server/tika-server-eval/src/main/java/org/apache/tika/server/eval/TikaEvalResource.java @@ -32,10 +32,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-server/tika-server-eval/src/test/java/org/apache/tika/server/eval/TikaEvalResourceTest.java b/tika-server/tika-server-eval/src/test/java/org/apache/tika/server/eval/TikaEvalResourceTest.java index e1acb3b1d..d531638eb 100644 --- a/tika-server/tika-server-eval/src/test/java/org/apache/tika/server/eval/TikaEvalResourceTest.java +++ b/tika-server/tika-server-eval/src/test/java/org/apache/tika/server/eval/TikaEvalResourceTest.java @@ -29,7 +29,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/tika-server/tika-server-standard/pom.xml b/tika-server/tika-server-standard/pom.xml index f91956741..bf926cc83 100644 --- a/tika-server/tika-server-standard/pom.xml +++ b/tika-server/tika-server-standard/pom.xml @@ -161,7 +161,7 @@ <exclude>jakarta.xml.bind:jakarta.xml.bind-api:jar:</exclude> <exclude>org.glassfish.jaxb:txw2:jar:</exclude> <exclude>com.sun.istack:istack-commons-runtime:jar:</exclude> - <exclude>com.sun.activation:jakarta.activation:jar:</exclude> + <exclude>com.sun.activation:jakarta.activation:jar:</exclude> <!-- NOT SURA these coordinates are correcte --> <exclude>com.fasterxml.jackson.core:jackson-core:jar:</exclude> <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:</exclude> <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:</exclude> diff --git a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/PDFServerConfig.java b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/PDFServerConfig.java index 78dd79b13..2bcf9e2fc 100644 --- a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/PDFServerConfig.java +++ b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/PDFServerConfig.java @@ -20,7 +20,7 @@ import static org.apache.tika.server.core.resource.TikaResource.processHeaderCon import java.util.List; import java.util.Map; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.commons.lang3.StringUtils; diff --git a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/TesseractServerConfig.java b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/TesseractServerConfig.java index f55bf6c87..fad383b3a 100644 --- a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/TesseractServerConfig.java +++ b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/TesseractServerConfig.java @@ -20,7 +20,7 @@ import static org.apache.tika.server.core.resource.TikaResource.processHeaderCon import java.util.List; import java.util.Map; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.commons.lang3.StringUtils; diff --git a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/resource/XMPMetadataResource.java b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/resource/XMPMetadataResource.java index da130d206..0a39fbfec 100644 --- a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/resource/XMPMetadataResource.java +++ b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/resource/XMPMetadataResource.java @@ -17,16 +17,16 @@ package org.apache.tika.server.standard.resource; import java.io.InputStream; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.apache.cxf.jaxrs.ext.multipart.Attachment; diff --git a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/writer/XMPMessageBodyWriter.java b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/writer/XMPMessageBodyWriter.java index 1cf646a19..14ec3afc6 100644 --- a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/writer/XMPMessageBodyWriter.java +++ b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/writer/XMPMessageBodyWriter.java @@ -25,11 +25,11 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java index 1ca85a55e..87497ed2c 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java index 63d0785d4..81b967f63 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java @@ -25,7 +25,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java index 0d25ba319..13b5ba3f7 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java @@ -28,8 +28,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OpenNLPMetadataFilterTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OpenNLPMetadataFilterTest.java index ca81e5df4..e42744428 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OpenNLPMetadataFilterTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OpenNLPMetadataFilterTest.java @@ -25,7 +25,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OptimaizeMetadataFilterTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OptimaizeMetadataFilterTest.java index 6dba4a425..5697a2f6b 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OptimaizeMetadataFilterTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OptimaizeMetadataFilterTest.java @@ -25,7 +25,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java index d365cd7c1..f1d119927 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java index d4c059a1c..791007721 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java @@ -28,9 +28,9 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java index 2d21e4d1d..3327c7c05 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.InputStream; import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java index e5a0544da..fa900a9ec 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.InputStream; import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java index bb83cedf2..0be7b5675 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.InputStream; import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java index 172600ec0..28ae9c122 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java @@ -30,7 +30,7 @@ import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java index a427b6e00..4b1cf914e 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java @@ -31,9 +31,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Locale; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.commons.codec.binary.Base64; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java index 82e3ba482..d8d6216d1 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.imageio.ImageIO; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceWithConfigTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceWithConfigTest.java index c43630467..32c296d3f 100644 --- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceWithConfigTest.java +++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceWithConfigTest.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.imageio.ImageIO; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/GoogleTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/GoogleTranslator.java index 6f5ea198b..97b01b4ee 100644 --- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/GoogleTranslator.java +++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/GoogleTranslator.java @@ -24,8 +24,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.Properties; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslator.java index bf391df51..a28084ee7 100644 --- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslator.java +++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslator.java @@ -28,8 +28,8 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/Lingo24Translator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/Lingo24Translator.java index fcb32c87a..cc650d5c6 100644 --- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/Lingo24Translator.java +++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/Lingo24Translator.java @@ -24,8 +24,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.Properties; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/RTGTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/RTGTranslator.java index 2016a4062..a878bece7 100644 --- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/RTGTranslator.java +++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/RTGTranslator.java @@ -28,8 +28,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/YandexTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/YandexTranslator.java index 91687e0ea..dbe24f752 100644 --- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/YandexTranslator.java +++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/YandexTranslator.java @@ -24,8 +24,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.Properties; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonNode;