You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2023/05/02 16:41:13 UTC

[tika] 01/01: TIKA-4022 turn on CompositeExternalParser in tika-app and tika-server-standard

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch TIKA-4022
in repository https://gitbox.apache.org/repos/asf/tika.git

commit fda83ce4787544cd428904ae5658ea4484ff394d
Author: tallison <ta...@apache.org>
AuthorDate: Tue May 2 12:40:54 2023 -0400

    TIKA-4022 turn on CompositeExternalParser in tika-app and tika-server-standard
---
 tika-app/pom.xml                                         |  2 +-
 .../META-INF/services/org.apache.tika.parser.Parser      | 16 ++++++++++++++++
 .../tika-parsers-standard-package/pom.xml                | 14 ++------------
 .../META-INF/services/org.apache.tika.parser.Parser      | 16 ++++++++++++++++
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index 3894a3a9b..29ec82c07 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -44,7 +44,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tika</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>tika-parser-html-commons</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/tika-app/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-app/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
new file mode 100644
index 000000000..37f87a459
--- /dev/null
+++ b/tika-app/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
@@ -0,0 +1,16 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+org.apache.tika.parser.external.CompositeExternalParser
\ No newline at end of file
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml
index b764d11fc..8e2b1aed2 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml
@@ -405,6 +405,7 @@
                   <include>org.apache.tika:tika-parser-pdf-module</include>
                   <include>org.apache.tika:tika-parser-pkg-module</include>
                   <include>org.apache.tika:tika-parser-text-module</include>
+                  <include>org.apache.tika:tika-parser-webarchive-module</include>
                   <include>org.apache.tika:tika-parser-xml-module</include>
                   <include>org.apache.tika:tika-parser-xmp-commons</include>
                   <include>org.apache.tika:tika-parser-zip-commons</include>
@@ -435,18 +436,7 @@
                     <Automatic-Module-Name>org.apache.tika.parsers</Automatic-Module-Name>
                   </manifestEntries>
                 </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/services/org.apache.tika.detect.Detector</resource>
-                </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/services/org.apache.tika.detect.EncodingDetector</resource>
-                </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/services/org.apache.tika.parser.Parser</resource>
-                </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector</resource>
-                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
               </transformers>
             </configuration>
           </execution>
diff --git a/tika-server/tika-server-standard/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-server/tika-server-standard/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
new file mode 100644
index 000000000..37f87a459
--- /dev/null
+++ b/tika-server/tika-server-standard/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
@@ -0,0 +1,16 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+org.apache.tika.parser.external.CompositeExternalParser
\ No newline at end of file