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

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


The following commit(s) were added to refs/heads/main by this push:
     new 4bd131803 Circumvention for MNG-8180 Maven bug (#1855)
     new 409d34f1c Merge remote-tracking branch 'origin/main'
4bd131803 is described below

commit 4bd131803252a76f3f98b6650decfd2130b6010f
Author: tallison <[email protected]>
AuthorDate: Thu Jul 11 18:24:15 2024 -0400

    Circumvention for MNG-8180 Maven bug (#1855)
---
 tika-app/pom.xml                         | 1 +
 tika-eval/tika-eval-app/pom.xml          | 1 +
 tika-eval/tika-eval-core/pom.xml         | 1 +
 tika-server/tika-server-core/pom.xml     | 1 +
 tika-server/tika-server-standard/pom.xml | 1 +
 5 files changed, 5 insertions(+)

diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index b94699861..431034a88 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -129,6 +129,7 @@
                 <filter>
                   <artifact>*:*</artifact>
                   <excludes>
+                    <exclude>META-INF/maven/plugin.xml</exclude>
                     <exclude>module-info.class</exclude>
                     <exclude>META-INF/*</exclude>
                     <exclude>LICENSE.txt</exclude>
diff --git a/tika-eval/tika-eval-app/pom.xml b/tika-eval/tika-eval-app/pom.xml
index b93783f75..75cdb19ce 100644
--- a/tika-eval/tika-eval-app/pom.xml
+++ b/tika-eval/tika-eval-app/pom.xml
@@ -114,6 +114,7 @@
                 <filter>
                   <artifact>*:*</artifact>
                   <excludes>
+                    <exclude>META-INF/maven/plugin.xml</exclude>
                     <exclude>module-info.class</exclude>
                     <exclude>LICENSE.txt</exclude>
                     <exclude>NOTICE.txt</exclude>
diff --git a/tika-eval/tika-eval-core/pom.xml b/tika-eval/tika-eval-core/pom.xml
index ac6470bee..65b06a292 100644
--- a/tika-eval/tika-eval-core/pom.xml
+++ b/tika-eval/tika-eval-core/pom.xml
@@ -115,6 +115,7 @@
                   <artifact>*:*</artifact>
                   <excludes>
                     <exclude>module-info.class</exclude>
+                    <exclude>META-INF/maven/plugin.xml</exclude>
                     <exclude>LICENSE.txt</exclude>
                     <exclude>NOTICE.txt</exclude>
                     <exclude>module-info.class</exclude>
diff --git a/tika-server/tika-server-core/pom.xml 
b/tika-server/tika-server-core/pom.xml
index 3d86cd569..40f0048c9 100644
--- a/tika-server/tika-server-core/pom.xml
+++ b/tika-server/tika-server-core/pom.xml
@@ -164,6 +164,7 @@
                   <artifact>*:*</artifact>
                   <excludes>
                     <exclude>module-info.class</exclude>
+                    <exclude>META-INF/maven/plugin.xml</exclude>
                     <exclude>META-INF/versions/9/module-info.class</exclude>
                     <exclude>META-INF/versions/11/module-info.class</exclude>
                     <exclude>META-INF/*.SF</exclude>
diff --git a/tika-server/tika-server-standard/pom.xml 
b/tika-server/tika-server-standard/pom.xml
index a89a57bff..f97eed8d0 100644
--- a/tika-server/tika-server-standard/pom.xml
+++ b/tika-server/tika-server-standard/pom.xml
@@ -195,6 +195,7 @@
                   <excludes>
                     <exclude>module-info.class</exclude>
                     <exclude>META-INF/versions/9/module-info.class</exclude>
+                    <exclude>META-INF/maven/plugin.xml</exclude>
                     <exclude>META-INF/*.SF</exclude>
                     <exclude>META-INF/*.DSA</exclude>
                     <exclude>META-INF/*.RSA</exclude>

Reply via email to