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 2021/07/15 18:12:23 UTC
[tika] branch main updated: TIKA-3481 -- move tika-core to provided
where possible so that it isn't bundled where we can rely on users to
include it.
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 55530f9 TIKA-3481 -- move tika-core to provided where possible so that it isn't bundled where we can rely on users to include it.
55530f9 is described below
commit 55530f9255177c120e8b49796e5b78a8627a2abd
Author: tallison <ta...@apache.org>
AuthorDate: Thu Jul 15 14:02:49 2021 -0400
TIKA-3481 -- move tika-core to provided where possible so that it isn't bundled where we can rely on users to include it.
---
tika-fuzzing/pom.xml | 6 ++++++
tika-langdetect/pom.xml | 1 +
tika-langdetect/tika-langdetect-lingo24/pom.xml | 6 ------
tika-langdetect/tika-langdetect-mitll-text/pom.xml | 6 ------
tika-langdetect/tika-langdetect-optimaize/pom.xml | 5 -----
tika-langdetect/tika-langdetect-test-commons/pom.xml | 7 -------
tika-langdetect/tika-langdetect-tika/pom.xml | 5 -----
tika-parsers/tika-parsers-extended/pom.xml | 1 +
tika-parsers/tika-parsers-ml/pom.xml | 8 ++++++++
tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml | 5 -----
tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml | 5 -----
.../tika-parsers-standard/tika-parsers-standard-modules/pom.xml | 1 +
.../tika-parsers-standard/tika-parsers-standard-package/pom.xml | 7 ++++++-
13 files changed, 23 insertions(+), 40 deletions(-)
diff --git a/tika-fuzzing/pom.xml b/tika-fuzzing/pom.xml
index c5f957a..1b5245b 100644
--- a/tika-fuzzing/pom.xml
+++ b/tika-fuzzing/pom.xml
@@ -34,6 +34,12 @@
<dependencies>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${commons.cli.version}</version>
diff --git a/tika-langdetect/pom.xml b/tika-langdetect/pom.xml
index 4d9f251..901cdef 100644
--- a/tika-langdetect/pom.xml
+++ b/tika-langdetect/pom.xml
@@ -45,6 +45,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>tika-core</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/tika-langdetect/tika-langdetect-lingo24/pom.xml b/tika-langdetect/tika-langdetect-lingo24/pom.xml
index aa726e1..251d739 100644
--- a/tika-langdetect/tika-langdetect-lingo24/pom.xml
+++ b/tika-langdetect/tika-langdetect-lingo24/pom.xml
@@ -30,12 +30,6 @@
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- for java 10
See TIKA-2778 for why we need to do this now.
May the gods of dependency management fix this in the future.
diff --git a/tika-langdetect/tika-langdetect-mitll-text/pom.xml b/tika-langdetect/tika-langdetect-mitll-text/pom.xml
index 80a7e6e..ed08af5 100644
--- a/tika-langdetect/tika-langdetect-mitll-text/pom.xml
+++ b/tika-langdetect/tika-langdetect-mitll-text/pom.xml
@@ -29,12 +29,6 @@
<name>Apache Tika MIT Lincoln Labs langdetect</name>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- for java 10
See TIKA-2778 for why we need to do this now.
May the gods of dependency management fix this in the future.
diff --git a/tika-langdetect/tika-langdetect-optimaize/pom.xml b/tika-langdetect/tika-langdetect-optimaize/pom.xml
index f2651fc..a173979 100644
--- a/tika-langdetect/tika-langdetect-optimaize/pom.xml
+++ b/tika-langdetect/tika-langdetect-optimaize/pom.xml
@@ -31,11 +31,6 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>com.optimaize.languagedetector</groupId>
<artifactId>language-detector</artifactId>
<version>${optimaize.version}</version>
diff --git a/tika-langdetect/tika-langdetect-test-commons/pom.xml b/tika-langdetect/tika-langdetect-test-commons/pom.xml
index 0c3d299..bcefb7a 100644
--- a/tika-langdetect/tika-langdetect-test-commons/pom.xml
+++ b/tika-langdetect/tika-langdetect-test-commons/pom.xml
@@ -28,13 +28,6 @@
<artifactId>tika-langdetect-test-commons</artifactId>
<name>Apache Tika langdetect test commons</name>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
diff --git a/tika-langdetect/tika-langdetect-tika/pom.xml b/tika-langdetect/tika-langdetect-tika/pom.xml
index cab5823..f4ad0ba 100644
--- a/tika-langdetect/tika-langdetect-tika/pom.xml
+++ b/tika-langdetect/tika-langdetect-tika/pom.xml
@@ -31,11 +31,6 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>com.optimaize.languagedetector</groupId>
<artifactId>language-detector</artifactId>
<version>${optimaize.version}</version>
diff --git a/tika-parsers/tika-parsers-extended/pom.xml b/tika-parsers/tika-parsers-extended/pom.xml
index 9d86865..fbbf299 100644
--- a/tika-parsers/tika-parsers-extended/pom.xml
+++ b/tika-parsers/tika-parsers-extended/pom.xml
@@ -35,6 +35,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>tika-core</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<!-- test dependencies -->
<dependency>
diff --git a/tika-parsers/tika-parsers-ml/pom.xml b/tika-parsers/tika-parsers-ml/pom.xml
index b8ea8cc..d61814b 100644
--- a/tika-parsers/tika-parsers-ml/pom.xml
+++ b/tika-parsers/tika-parsers-ml/pom.xml
@@ -42,6 +42,14 @@
<module>tika-transcribe-aws</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<pluginManagement>
<plugins>
diff --git a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
index 8df39e9..48e51dc 100644
--- a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
@@ -33,11 +33,6 @@
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- AgePredictor client for Tika -->
<dependency>
<groupId>edu.usc.ir</groupId>
diff --git a/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml b/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml
index a448e58..de27f35 100644
--- a/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml
@@ -35,11 +35,6 @@
<!--TODO use latest aws version or the one defined in the tika-parent-->
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-transcribe</artifactId>
<version>${aws.transcribe.version}</version>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml
index a66a469..d60e9aa 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml
@@ -40,6 +40,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>tika-core</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<!-- test dependencies -->
<dependency>
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 a352ab7..cab8b14 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
@@ -38,7 +38,12 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
-
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tika-parser-apple-module</artifactId>