You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by gr...@apache.org on 2022/11/19 23:11:11 UTC
[tika] branch build-refactoring created (now cefe93a29)
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a change to branch build-refactoring
in repository https://gitbox.apache.org/repos/asf/tika.git
at cefe93a29 Replace commons-logging with jcl-over-slf4j
This branch includes the following new commits:
new fa5221140 TIKA-3934 Change POM parent chain: tika-parent <- tika <- tika-*
new eb1707a75 TIKA-3934 POM files reformat and cleanup
new a52a2d4ce TIKA-3934 Move enforcer plugin configuration to the `tika` (reactor)
new 348a83438 Ban commons-logging except in test scope
new ad7d63d9c Turn off enforcer plugin in the `tika-age-recognizer`
new cefe93a29 Replace commons-logging with jcl-over-slf4j
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[tika] 01/06: TIKA-3934 Change POM parent chain: tika-parent <- tika <- tika-*
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a commit to branch build-refactoring
in repository https://gitbox.apache.org/repos/asf/tika.git
commit fa522114095fc1286193b3e145d6788a9bfb5c4c
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Wed Nov 16 17:51:01 2022 +0300
TIKA-3934 Change POM parent chain: tika-parent <- tika <- tika-*
This change is prerequisite to move dependency management and plugin
configuration to `tika` module (reactor) and leave only project info
in `tika-parent`.
Curently `tika-bom` forces not only Tika component versions but all
the dependencies. For example if downstream library only use
`tika-core` we shouldn't force Netty/Jetty/Lucene/etc versions on it.
New module layout:
```
tika-parent
|- tika-bom
\- tika
|- tika-core
:
|- tika-parsers
| |- tika-parsers-extended
| |- tika-parsers-ml
| \- tika-parsers-standard
| |- tika-parsers-standard-modules
| | |- tika-parser-apple-module
| | :
| | \- tika-parser-zip-commons
| \- tika-parsers-standard-package
:
\- tika-xmp
```
---
tika-app/pom.xml | 4 ++--
tika-batch/pom.xml | 4 ++--
tika-bundles/pom.xml | 4 ++--
tika-core/pom.xml | 4 ++--
tika-detectors/pom.xml | 4 ++--
tika-eval/pom.xml | 4 ++--
tika-example/pom.xml | 4 ++--
tika-fuzzing/pom.xml | 4 ++--
tika-integration-tests/pom.xml | 4 ++--
tika-java7/pom.xml | 4 ++--
tika-langdetect/pom.xml | 4 ++--
tika-parsers/pom.xml | 4 ++--
tika-pipes/pom.xml | 4 ++--
tika-serialization/pom.xml | 4 ++--
tika-server/pom.xml | 4 ++--
tika-translate/pom.xml | 4 ++--
tika-xmp/pom.xml | 4 ++--
17 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index 26b4a4573..b671ba0cf 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-app</artifactId>
diff --git a/tika-batch/pom.xml b/tika-batch/pom.xml
index 689594a04..8fb9dcc79 100644
--- a/tika-batch/pom.xml
+++ b/tika-batch/pom.xml
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-batch</artifactId>
diff --git a/tika-bundles/pom.xml b/tika-bundles/pom.xml
index 45d19f993..2c8c78963 100644
--- a/tika-bundles/pom.xml
+++ b/tika-bundles/pom.xml
@@ -19,10 +19,10 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tika-core/pom.xml b/tika-core/pom.xml
index 43561ffbe..b5e4b7634 100644
--- a/tika-core/pom.xml
+++ b/tika-core/pom.xml
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-core</artifactId>
diff --git a/tika-detectors/pom.xml b/tika-detectors/pom.xml
index 545922c6e..f88bd552b 100644
--- a/tika-detectors/pom.xml
+++ b/tika-detectors/pom.xml
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-detectors</artifactId>
diff --git a/tika-eval/pom.xml b/tika-eval/pom.xml
index 9c0a3aa87..4b22ca399 100644
--- a/tika-eval/pom.xml
+++ b/tika-eval/pom.xml
@@ -23,9 +23,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-eval</artifactId>
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index b140b8404..a07cf803f 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-example</artifactId>
diff --git a/tika-fuzzing/pom.xml b/tika-fuzzing/pom.xml
index b00669952..944cbd396 100644
--- a/tika-fuzzing/pom.xml
+++ b/tika-fuzzing/pom.xml
@@ -20,9 +20,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-fuzzing</artifactId>
diff --git a/tika-integration-tests/pom.xml b/tika-integration-tests/pom.xml
index 66b50e74a..ed27a0916 100644
--- a/tika-integration-tests/pom.xml
+++ b/tika-integration-tests/pom.xml
@@ -20,9 +20,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tika-java7/pom.xml b/tika-java7/pom.xml
index f9a5f9b57..b801c4c67 100644
--- a/tika-java7/pom.xml
+++ b/tika-java7/pom.xml
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-java7</artifactId>
diff --git a/tika-langdetect/pom.xml b/tika-langdetect/pom.xml
index afd4c2216..e641b5044 100644
--- a/tika-langdetect/pom.xml
+++ b/tika-langdetect/pom.xml
@@ -20,9 +20,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 9e4793fa6..f6cdbe7e6 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -20,9 +20,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tika-pipes/pom.xml b/tika-pipes/pom.xml
index 2f0f833cf..ea3aba6d3 100644
--- a/tika-pipes/pom.xml
+++ b/tika-pipes/pom.xml
@@ -19,9 +19,9 @@
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-pipes</artifactId>
diff --git a/tika-serialization/pom.xml b/tika-serialization/pom.xml
index 908c15242..d12582ebf 100644
--- a/tika-serialization/pom.xml
+++ b/tika-serialization/pom.xml
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-serialization</artifactId>
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index 4a52fe47e..1fcbd7316 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -25,9 +25,9 @@
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-server</artifactId>
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index a882dac46..a13b74056 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-translate</artifactId>
diff --git a/tika-xmp/pom.xml b/tika-xmp/pom.xml
index 5a13d3697..89e5a9070 100644
--- a/tika-xmp/pom.xml
+++ b/tika-xmp/pom.xml
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-xmp</artifactId>
[tika] 06/06: Replace commons-logging with jcl-over-slf4j
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a commit to branch build-refactoring
in repository https://gitbox.apache.org/repos/asf/tika.git
commit cefe93a2923e111aabaa3e316ce180d246c4f812
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Sat Nov 19 22:24:09 2022 +0300
Replace commons-logging with jcl-over-slf4j
---
tika-app/pom.xml | 4 ++++
tika-example/pom.xml | 4 ++++
.../tika-parser-scientific-module/pom.xml | 8 +++++++
.../tika-parser-advancedmedia-module/pom.xml | 12 +++++++++++
.../tika-parsers-ml/tika-transcribe-aws/pom.xml | 12 +++++++++++
.../tika-parsers-standard-modules/pom.xml | 25 ++++++++++++++++++++++
.../tika-parser-font-module/pom.xml | 6 ++++++
.../tika-parser-microsoft-module/pom.xml | 12 +++++++++++
.../tika-parser-pdf-module/pom.xml | 6 ++++++
.../tika-parser-xmp-commons/pom.xml | 6 ++++++
tika-pipes/tika-emitters/tika-emitter-s3/pom.xml | 11 ++++++++++
tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml | 5 +++++
tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml | 11 ++++++++++
tika-pipes/tika-httpclient-commons/pom.xml | 6 ++++++
.../tika-pipes-iterator-s3/pom.xml | 11 ++++++++++
15 files changed, 139 insertions(+)
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index b44192c45..e9d624236 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -85,6 +85,10 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index 140feb971..52fdb556e 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -82,6 +82,10 @@
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<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 3314eea57..df7babc6c 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
@@ -70,6 +70,10 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -81,6 +85,10 @@
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- TIKA-3095: Required for grib -->
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml
index 884e6bdd2..ff21aa768 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml
@@ -45,6 +45,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -57,6 +63,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.github.openjson</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 fdb4227c3..718bb27e5 100644
--- a/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml
@@ -40,11 +40,23 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-transcribe</artifactId>
<version>${aws.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
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 d7b5bbe03..43be87b5c 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,31 @@
<artifactId>tika-core</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<modules>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml
index 67b5e0ef5..0e5751c33 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml
@@ -38,6 +38,12 @@
<groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId>
<version>${pdfbox.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml
index 6111290f3..a170d6e20 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml
@@ -88,6 +88,12 @@
<dependency>
<groupId>com.healthmarketscience.jackcess</groupId>
<artifactId>jackcess</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.healthmarketscience.jackcess</groupId>
@@ -101,6 +107,7 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
+
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -112,6 +119,11 @@
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml
index 38be3cf5f..4fc885b55 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml
@@ -43,6 +43,12 @@
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>${pdfbox.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml
index d275a6798..e68f7adce 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml
@@ -43,6 +43,12 @@
<groupId>org.apache.pdfbox</groupId>
<artifactId>xmpbox</artifactId>
<version>${pdfbox.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
index 5a499b80b..406c07d66 100644
--- a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
@@ -49,6 +49,12 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -56,6 +62,11 @@
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
index 7b2a9c4ec..dabece55a 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
+++ b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
@@ -48,6 +48,11 @@
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
index 5e58921ed..999d804da 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
+++ b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
@@ -42,6 +42,12 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -49,6 +55,11 @@
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tika-pipes/tika-httpclient-commons/pom.xml b/tika-pipes/tika-httpclient-commons/pom.xml
index 19253b81a..93faa77b0 100644
--- a/tika-pipes/tika-httpclient-commons/pom.xml
+++ b/tika-pipes/tika-httpclient-commons/pom.xml
@@ -43,6 +43,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
index df4596662..988f916f2 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
@@ -43,6 +43,12 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -50,6 +56,11 @@
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
[tika] 02/06: TIKA-3934 POM files reformat and cleanup
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a commit to branch build-refactoring
in repository https://gitbox.apache.org/repos/asf/tika.git
commit eb1707a754819a77cb66e3b74a34f8c23ceada8e
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Wed Nov 16 21:31:27 2022 +0300
TIKA-3934 POM files reformat and cleanup
* add correct `<?xml ...` tags if absent
* remove `<scm><tag>2.2.1-rc2</tag></scm>`
* empty strings before and after license comment
* same order for primary fields: `modelVersion`, `parent.groupId`,
`parent.artifactId`, `artifactId`, `packaging`, `name`, `description`
* `dependencyManagement` in `tika` (reactor) for test jars and other
artifacts required for integration tests
* import `tika-bom` in `tika` (reactor)
* remove dependency `version`s for tika artifacts (except test-jars in
`tika-parsers-standard-package` for test-jars used only there)
* remove extra `organization`, `issueManagement`, `ciManagement`, `url`
tags, keep them in `tika-parent` only
* reformat POMs that used non-standard indent (4 spaces instead of 2)
* use explicit `<groupId>org.apache.tika</groupId>` instead of
`<groupId>${project.groupId}</groupId>`
* add `tika-parser-webarchive-module` to BOM
* add missing `groupId`s for the plugins
* remove dependency versions if they are inherited from
`dependencyManagement`
* move common test dependencies to parent POMs and remove redundant ones
* removed some explicit dependency declarations when they are already
present via transitive dependencies (like `jackson-core` when
`jackson-databind` already declared)
---
pom.xml | 101 ++++--
tika-app/pom.xml | 40 +--
tika-batch/pom.xml | 14 +-
tika-bom/pom.xml | 8 +-
tika-bundles/pom.xml | 18 +-
tika-bundles/tika-bundle-standard/pom.xml | 34 +-
tika-core/pom.xml | 46 +--
tika-detectors/pom.xml | 3 +-
tika-detectors/tika-detector-siegfried/pom.xml | 23 +-
tika-eval/pom.xml | 9 +-
tika-eval/tika-eval-app/pom.xml | 21 +-
tika-eval/tika-eval-core/pom.xml | 30 +-
tika-example/pom.xml | 19 +-
tika-fuzzing/pom.xml | 28 +-
tika-integration-tests/pom.xml | 39 ++-
.../tika-pipes-kafka-integration-tests/pom.xml | 39 +--
.../pom.xml | 64 ++--
.../tika-pipes-s3-integration-tests/pom.xml | 41 +--
.../tika-pipes-solr-integration-tests/pom.xml | 38 +--
.../tika-resource-loading-tests/pom.xml | 28 +-
tika-java7/pom.xml | 56 ++--
tika-langdetect/pom.xml | 29 +-
tika-langdetect/tika-langdetect-lingo24/pom.xml | 18 +-
tika-langdetect/tika-langdetect-mitll-text/pom.xml | 20 +-
tika-langdetect/tika-langdetect-opennlp/pom.xml | 21 +-
tika-langdetect/tika-langdetect-optimaize/pom.xml | 19 +-
.../tika-langdetect-test-commons/pom.xml | 15 +-
tika-langdetect/tika-langdetect-tika/pom.xml | 20 +-
tika-parent/pom.xml | 13 +-
tika-parsers/pom.xml | 28 +-
tika-parsers/tika-parsers-extended/pom.xml | 15 +-
.../tika-parser-scientific-module/pom.xml | 22 +-
.../tika-parser-scientific-package/pom.xml | 25 +-
.../tika-parser-sqlite3-module/pom.xml | 18 +-
.../tika-parser-sqlite3-package/pom.xml | 18 +-
.../pom.xml | 28 +-
tika-parsers/tika-parsers-ml/pom.xml | 18 +-
.../tika-parsers-ml/tika-age-recogniser/pom.xml | 12 +-
tika-parsers/tika-parsers-ml/tika-dl/pom.xml | 10 +-
.../tika-parser-advancedmedia-module/pom.xml | 18 +-
.../tika-parser-advancedmedia-package/pom.xml | 22 +-
.../tika-parsers-ml/tika-parser-nlp-module/pom.xml | 343 +++++++++++----------
.../tika-parser-nlp-package/pom.xml | 23 +-
.../tika-parsers-ml/tika-transcribe-aws/pom.xml | 13 +-
tika-parsers/tika-parsers-standard/pom.xml | 17 +-
.../tika-parsers-standard-modules/pom.xml | 24 +-
.../tika-parser-apple-module/pom.xml | 21 +-
.../tika-parser-audiovideo-module/pom.xml | 16 +-
.../tika-parser-cad-module/pom.xml | 26 +-
.../tika-parser-code-module/pom.xml | 19 +-
.../tika-parser-crypto-module/pom.xml | 15 +-
.../tika-parser-digest-commons/pom.xml | 15 +-
.../tika-parser-font-module/pom.xml | 15 +-
.../tika-parser-html-commons/pom.xml | 16 +-
.../tika-parser-html-module/pom.xml | 19 +-
.../tika-parser-image-module/pom.xml | 24 +-
.../tika-parser-jdbc-commons/pom.xml | 14 +-
.../tika-parser-mail-commons/pom.xml | 16 +-
.../tika-parser-mail-module/pom.xml | 33 +-
.../tika-parser-microsoft-module/pom.xml | 35 +--
.../tika-parser-miscoffice-module/pom.xml | 39 ++-
.../tika-parser-news-module/pom.xml | 19 +-
.../tika-parser-ocr-module/pom.xml | 19 +-
.../tika-parser-pdf-module/pom.xml | 21 +-
.../tika-parser-pkg-module/pom.xml | 26 +-
.../tika-parser-text-module/pom.xml | 14 +-
.../tika-parser-webarchive-module/pom.xml | 22 +-
.../tika-parser-xml-module/pom.xml | 15 +-
.../tika-parser-xmp-commons/pom.xml | 16 +-
.../tika-parser-zip-commons/pom.xml | 15 +-
.../tika-parsers-standard-package/pom.xml | 141 ++++-----
tika-pipes/pom.xml | 11 +-
tika-pipes/tika-async-cli/pom.xml | 23 +-
tika-pipes/tika-emitters/pom.xml | 15 +-
.../tika-emitters/tika-emitter-az-blob/pom.xml | 23 +-
tika-pipes/tika-emitters/tika-emitter-fs/pom.xml | 22 +-
tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml | 23 +-
tika-pipes/tika-emitters/tika-emitter-jdbc/pom.xml | 15 +-
.../tika-emitters/tika-emitter-kafka/pom.xml | 23 +-
.../tika-emitters/tika-emitter-opensearch/pom.xml | 34 +-
tika-pipes/tika-emitters/tika-emitter-s3/pom.xml | 25 +-
tika-pipes/tika-emitters/tika-emitter-solr/pom.xml | 33 +-
tika-pipes/tika-fetchers/pom.xml | 18 +-
.../tika-fetchers/tika-fetcher-az-blob/pom.xml | 201 ++++++------
tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml | 175 ++++++-----
tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml | 36 +--
tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml | 186 +++++------
tika-pipes/tika-httpclient-commons/pom.xml | 18 +-
tika-pipes/tika-pipes-iterators/pom.xml | 13 +-
.../tika-pipes-iterator-az-blob/pom.xml | 16 +-
.../tika-pipes-iterator-csv/pom.xml | 16 +-
.../tika-pipes-iterator-gcs/pom.xml | 16 +-
.../tika-pipes-iterator-jdbc/pom.xml | 17 +-
.../tika-pipes-iterator-kafka/pom.xml | 22 +-
.../tika-pipes-iterator-s3/pom.xml | 17 +-
.../tika-pipes-iterator-solr/pom.xml | 26 +-
tika-pipes/tika-pipes-reporters/pom.xml | 13 +-
.../tika-pipes-reporter-fs-status/pom.xml | 24 +-
.../tika-pipes-reporter-jdbc/pom.xml | 13 +-
.../tika-pipes-reporter-opensearch/pom.xml | 18 +-
tika-serialization/pom.xml | 30 +-
tika-server/pom.xml | 25 +-
tika-server/tika-server-client/pom.xml | 33 +-
tika-server/tika-server-core/pom.xml | 61 ++--
tika-server/tika-server-eval/pom.xml | 18 +-
tika-server/tika-server-standard/pom.xml | 54 +---
tika-translate/pom.xml | 40 +--
tika-xmp/pom.xml | 66 ++--
108 files changed, 1599 insertions(+), 1959 deletions(-)
diff --git a/pom.xml b/pom.xml
index 786aaacd4..02df9b853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,8 +31,12 @@
<artifactId>tika</artifactId>
<packaging>pom</packaging>
+
<name>Apache Tika</name>
- <url>https://tika.apache.org</url>
+ <description>
+ The Apache Tika™ toolkit detects and extracts metadata and structured text content from various documents
+ using existing parser libraries.
+ </description>
<modules>
<module>tika-parent</module>
@@ -56,6 +60,82 @@
<module>tika-detectors</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-bom</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- reusable test dependencies -->
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-batch</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-app</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-server-eval</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-server-standard</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-server-core</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-batch</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-langdetect-test-commons</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<profiles>
<profile>
<id>apache-release</id>
@@ -196,23 +276,4 @@ least three +1 Tika PMC votes are cast.
</plugin>
</plugins>
</build>
- <description>The Apache Tika™ toolkit detects and extracts metadata and structured text content from various documents
- using existing parser libraries.
- </description>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>https://www.apache.org</url>
- </organization>
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/TIKA</url>
- </issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://ci-builds.apache.org/job/Tika/job/tika-main-jdk8/</url>
- </ciManagement>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index b671ba0cf..b44192c45 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -34,49 +34,42 @@
<url>https://tika.apache.org/</url>
<properties>
+ <!--suppress UnresolvedMavenProperty -->
<ikvm>${env.IKVM_HOME}</ikvm>
</properties>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parser-html-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect-optimaize</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-xmp</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-batch</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-emitter-fs</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-async-cli</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- logging -->
@@ -279,21 +272,4 @@
</build>
</profile>
</profiles>
-
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/TIKA</url>
- </issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/Tika-trunk/</url>
- </ciManagement>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-batch/pom.xml b/tika-batch/pom.xml
index 8fb9dcc79..6834451e4 100644
--- a/tika-batch/pom.xml
+++ b/tika-batch/pom.xml
@@ -31,19 +31,17 @@
<artifactId>tika-batch</artifactId>
<packaging>jar</packaging>
+
<name>Apache Tika batch</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
@@ -58,7 +56,6 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -130,11 +127,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-bom/pom.xml b/tika-bom/pom.xml
index 1cf0b48fb..95f378b69 100644
--- a/tika-bom/pom.xml
+++ b/tika-bom/pom.xml
@@ -18,6 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -30,8 +31,8 @@
<artifactId>tika-bom</artifactId>
<packaging>pom</packaging>
+
<name>Apache Tika BOM</name>
- <url>https://tika.apache.org/</url>
<dependencyManagement>
<dependencies>
@@ -214,6 +215,11 @@
<artifactId>tika-parser-xml-module</artifactId>
<version>2.6.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parser-webarchive-module</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.tika</groupId>
diff --git a/tika-bundles/pom.xml b/tika-bundles/pom.xml
index 2c8c78963..0a324bcd9 100644
--- a/tika-bundles/pom.xml
+++ b/tika-bundles/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,26 +18,23 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-bundles</artifactId>
- <version>2.6.1-SNAPSHOT</version>
- <name>Apache Tika bundles module</name>
-
<packaging>pom</packaging>
+ <name>Apache Tika bundles module</name>
+
<modules>
<module>tika-bundle-standard</module>
</modules>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-bundles/tika-bundle-standard/pom.xml b/tika-bundles/tika-bundle-standard/pom.xml
index 1e72250af..8d77de32b 100644
--- a/tika-bundles/tika-bundle-standard/pom.xml
+++ b/tika-bundles/tika-bundle-standard/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -29,8 +30,8 @@
</parent>
<artifactId>tika-bundle-standard</artifactId>
- <version>2.6.1-SNAPSHOT</version>
<packaging>bundle</packaging>
+
<name>Apache Tika OSGi standard bundle</name>
<description>
@@ -39,7 +40,7 @@
bundle exports no packages, only the Parser and Detector services
from the tika-parsers component.
</description>
- <url>https://tika.apache.org/</url>
+
<!-- pax doesn't yet work with junit4; checkstyle forbids junit4. -->
<properties>
<checkstyle.skip>true</checkstyle.skip>
@@ -47,19 +48,16 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-html-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -392,6 +390,7 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven.failsafe.version}</version>
<executions>
@@ -429,23 +428,4 @@
</plugin>
</plugins>
</build>
-
- <organization>
- <name>The Apache Software Founation</name>
- <url>http://www.apache.org</url>
- </organization>
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/TIKA</url>
- </issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/Tika-trunk/</url>
- </ciManagement>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
-
-
diff --git a/tika-core/pom.xml b/tika-core/pom.xml
index b5e4b7634..73f6044b2 100644
--- a/tika-core/pom.xml
+++ b/tika-core/pom.xml
@@ -31,8 +31,12 @@
<artifactId>tika-core</artifactId>
<packaging>bundle</packaging>
+
<name>Apache Tika core</name>
- <url>https://tika.apache.org/</url>
+ <description>
+ This is the core Apache Tika™ toolkit library from which all other modules inherit functionality. It
+ also includes the core facades for the Tika API.
+ </description>
<dependencies>
<!-- See https://issues.apache.org/jira/browse/TIKA-2566 for more info -->
@@ -43,21 +47,18 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
</dependency>
<!-- Optional OSGi dependencies, used only when running within OSGi -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${osgi.core.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${osgi.compendium.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -71,7 +72,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -83,25 +83,11 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j2.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit5.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -216,6 +202,7 @@
</executions>
</plugin> -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven.failsafe.version}</version>
<configuration>
@@ -282,25 +269,4 @@
</plugin>
</plugins>
</reporting>
-
- <description>This is the core Apache Tika™ toolkit library from which all other modules inherit functionality. It
- also
- includes the core facades for the Tika API.
- </description>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/TIKA</url>
- </issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/Tika-trunk/</url>
- </ciManagement>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-detectors/pom.xml b/tika-detectors/pom.xml
index f88bd552b..47713e959 100644
--- a/tika-detectors/pom.xml
+++ b/tika-detectors/pom.xml
@@ -31,9 +31,10 @@
<artifactId>tika-detectors</artifactId>
<packaging>pom</packaging>
+
<name>Apache Tika Detectors</name>
<modules>
<module>tika-detector-siegfried</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-detectors/tika-detector-siegfried/pom.xml b/tika-detectors/tika-detector-siegfried/pom.xml
index 446b56767..67fead1c3 100644
--- a/tika-detectors/tika-detector-siegfried/pom.xml
+++ b/tika-detectors/tika-detector-siegfried/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,33 +18,36 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-detectors</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-detectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-detector-siegfried</artifactId>
+
<name>Apache Tika Siegfried wrapper</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
+
<!-- test dependencies -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -57,13 +61,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -104,5 +108,4 @@
</plugin>
</plugins>
</build>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-eval/pom.xml b/tika-eval/pom.xml
index 4b22ca399..d83d9ea9f 100644
--- a/tika-eval/pom.xml
+++ b/tika-eval/pom.xml
@@ -21,6 +21,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika</artifactId>
@@ -29,10 +30,10 @@
</parent>
<artifactId>tika-eval</artifactId>
+ <packaging>pom</packaging>
+
<name>Apache Tika eval module</name>
- <url>https://tika.apache.org/</url>
- <packaging>pom</packaging>
<modules>
<module>tika-eval-core</module>
<module>tika-eval-app</module>
@@ -72,8 +73,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-eval/tika-eval-app/pom.xml b/tika-eval/tika-eval-app/pom.xml
index 54b5fc84b..bd75f3fb5 100644
--- a/tika-eval/tika-eval-app/pom.xml
+++ b/tika-eval/tika-eval-app/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,29 +18,31 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-eval</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-eval</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-eval-app</artifactId>
- <name>Apache Tika eval application</name>
+ <name>Apache Tika eval application</name>
<dependencies>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-eval-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-batch</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@@ -56,21 +59,21 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-batch</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -226,8 +229,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-eval/tika-eval-core/pom.xml b/tika-eval/tika-eval-core/pom.xml
index 0734d7da2..92148e0f4 100644
--- a/tika-eval/tika-eval-core/pom.xml
+++ b/tika-eval/tika-eval-core/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,33 +18,33 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-eval</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-eval</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-eval-core</artifactId>
- <name>Apache Tika eval core</name>
+ <name>Apache Tika eval core</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect-opennlp</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -60,17 +61,14 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
- <version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-icu</artifactId>
- <version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -84,14 +82,12 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-memory</artifactId>
- <version>${lucene.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -213,8 +209,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index a07cf803f..140feb971 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -30,8 +30,9 @@
</parent>
<artifactId>tika-example</artifactId>
+
<name>Apache Tika examples</name>
- <url>https://tika.apache.org/</url>
+ <description>This module contains examples of how to use Apache Tika.</description>
<!-- List of dependencies that we depend on for the examples. See the full list of Tika
modules and how to use them at http://mvnrepository.com/artifact/org.apache.tika.-->
@@ -39,37 +40,31 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-app</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-translate</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect-optimaize</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-eval-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-transcribe-aws</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -103,7 +98,6 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -112,7 +106,6 @@
</dependency>
</dependencies>
- <description>This module contains examples of how to use Apache Tika.</description>
<build>
<plugins>
<plugin>
@@ -147,8 +140,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-fuzzing/pom.xml b/tika-fuzzing/pom.xml
index 944cbd396..555368712 100644
--- a/tika-fuzzing/pom.xml
+++ b/tika-fuzzing/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +18,10 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika</artifactId>
@@ -26,27 +30,21 @@
</parent>
<artifactId>tika-fuzzing</artifactId>
- <name>Apache Tika fuzzing</name>
- <url>https://tika.apache.org/</url>
-
- <modelVersion>4.0.0</modelVersion>
+ <name>Apache Tika fuzzing</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-emitter-fs</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -56,18 +54,15 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parser-pkg-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parser-pdf-module</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -77,18 +72,17 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parser-digest-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- bring in the mock parser -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -123,4 +117,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-integration-tests/pom.xml b/tika-integration-tests/pom.xml
index ed27a0916..4c1da8c73 100644
--- a/tika-integration-tests/pom.xml
+++ b/tika-integration-tests/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,20 +18,22 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-integration-tests</artifactId>
- <name>Apache Tika integration tests</name>
-
<packaging>pom</packaging>
+ <name>Apache Tika integration tests</name>
+
<modules>
<module>tika-pipes-solr-integration-tests</module>
<module>tika-pipes-opensearch-integration-tests</module>
@@ -41,27 +44,39 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<!-- after we migrate everything to junit5, we can get rid of this -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>${junit5.version}</version>
<scope>test</scope>
</dependency>
- </dependencies>
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
index a5336a6d6..68bf1cab7 100644
--- a/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,56 +18,40 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-integration-tests</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-integration-tests</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-kafka-integration-tests</artifactId>
+
<name>Apache Tika Kafka pipes integration tests</name>
<dependencies>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>kafka</artifactId>
- <version>${test.containers.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-iterator-kafka</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-emitter-kafka</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-app</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -75,8 +60,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
index 357e768f0..5a5135f3d 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,77 +18,56 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-integration-tests</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-integration-tests</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-opensearch-integration-tests</artifactId>
+
<name>Apache Tika OpenSearch integration tests</name>
<dependencies>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
- <version>${jna.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-app</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-emitter-opensearch</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-reporter-opensearch</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
- <configuration>
- <excludes>
- <exclude>src/test/resources/opensearch/*.json</exclude>
- </excludes>
- </configuration>
- </plugin>
-</plugins>
- </build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/opensearch/*.json</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
index c883e61cf..ab16573b9 100644
--- a/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,57 +18,40 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-integration-tests</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-integration-tests</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-s3-integration-tests</artifactId>
+
<name>Apache Tika S3 pipes integration tests</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-fetcher-s3</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-iterator-s3</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-emitter-s3</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <version>${test.containers.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-app</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -90,7 +74,4 @@
</plugin>
</plugins>
</build>
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
index 2d107842e..bbcf5dd28 100644
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,58 +18,41 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-integration-tests</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-integration-tests</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-solr-integration-tests</artifactId>
+
<name>Apache Tika Apache Solr integration tests</name>
<dependencies>
<dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <version>${test.containers.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-iterator-solr</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-emitter-solr</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-app</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>${solrj.version}</version>
<scope>test</scope>
</dependency>
-
-
</dependencies>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-integration-tests/tika-resource-loading-tests/pom.xml b/tika-integration-tests/tika-resource-loading-tests/pom.xml
index 4739a4ac4..ffba79a10 100644
--- a/tika-integration-tests/tika-resource-loading-tests/pom.xml
+++ b/tika-integration-tests/tika-resource-loading-tests/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,36 +18,21 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-integration-tests</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-integration-tests</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>tika-resource-loading-tests</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-java7/pom.xml b/tika-java7/pom.xml
index b801c4c67..232c38134 100644
--- a/tika-java7/pom.xml
+++ b/tika-java7/pom.xml
@@ -31,14 +31,32 @@
<artifactId>tika-java7</artifactId>
<packaging>bundle</packaging>
+
<name>Apache Tika Java-7 Components</name>
- <url>https://tika.apache.org/</url>
+ <description>Java-7 reliant components, including FileTypeDetector implementations</description>
<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-package</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -74,40 +92,4 @@
</plugin>
</plugins>
</build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parsers-standard-package</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <description>Java-7 reliant components, including FileTypeDetector implementations</description>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/TIKA</url>
- </issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/Tika-trunk/</url>
- </ciManagement>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-langdetect/pom.xml b/tika-langdetect/pom.xml
index e641b5044..7b532d8f1 100644
--- a/tika-langdetect/pom.xml
+++ b/tika-langdetect/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,19 +18,21 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-langdetect</artifactId>
<packaging>pom</packaging>
+
<name>Apache Tika language detection</name>
- <url>https://tika.apache.org/</url>
<modules>
<module>tika-langdetect-test-commons</module>
@@ -42,24 +45,10 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -111,8 +100,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-langdetect/tika-langdetect-lingo24/pom.xml b/tika-langdetect/tika-langdetect-lingo24/pom.xml
index e16fa8503..e9bf1297a 100644
--- a/tika-langdetect/tika-langdetect-lingo24/pom.xml
+++ b/tika-langdetect/tika-langdetect-lingo24/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,17 +18,20 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-langdetect</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-langdetect</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-langdetect-lingo24</artifactId>
- <name>Apache Tika Lingo24 langdetect</name>
+ <name>Apache Tika Lingo24 langdetect</name>
<dependencies>
<!-- for java 10
@@ -51,16 +55,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tika-langdetect-test-commons</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-langdetect/tika-langdetect-mitll-text/pom.xml b/tika-langdetect/tika-langdetect-mitll-text/pom.xml
index 77273521b..1ff349ae5 100644
--- a/tika-langdetect/tika-langdetect-mitll-text/pom.xml
+++ b/tika-langdetect/tika-langdetect-mitll-text/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,15 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-langdetect</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-langdetect</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-langdetect-mitll-text</artifactId>
+
<name>Apache Tika MIT Lincoln Labs langdetect</name>
<dependencies>
@@ -50,17 +55,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect-test-commons</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-langdetect/tika-langdetect-opennlp/pom.xml b/tika-langdetect/tika-langdetect-opennlp/pom.xml
index a6ce27d53..4c5441814 100644
--- a/tika-langdetect/tika-langdetect-opennlp/pom.xml
+++ b/tika-langdetect/tika-langdetect-opennlp/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,29 +18,31 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-langdetect</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-langdetect</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-langdetect-opennlp</artifactId>
- <name>Apache Tika OpenNLP langdetect</name>
+ <name>Apache Tika OpenNLP langdetect</name>
<dependencies>
<dependency>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp-tools</artifactId>
- <version>${opennlp.version}</version>
</dependency>
+
<!-- test dependencies -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect-test-commons</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -58,8 +61,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-langdetect/tika-langdetect-optimaize/pom.xml b/tika-langdetect/tika-langdetect-optimaize/pom.xml
index 784fa89ce..6239ad601 100644
--- a/tika-langdetect/tika-langdetect-optimaize/pom.xml
+++ b/tika-langdetect/tika-langdetect-optimaize/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,17 +18,20 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-langdetect</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-langdetect</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-langdetect-optimaize</artifactId>
- <name>Apache Tika Optimaize langdetect</name>
+ <name>Apache Tika Optimaize langdetect</name>
<dependencies>
<dependency>
@@ -38,14 +42,9 @@
<!-- test dependencies -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect-test-commons</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-langdetect/tika-langdetect-test-commons/pom.xml b/tika-langdetect/tika-langdetect-test-commons/pom.xml
index 4d75396dd..017e8e4a9 100644
--- a/tika-langdetect/tika-langdetect-test-commons/pom.xml
+++ b/tika-langdetect/tika-langdetect-test-commons/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,15 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-langdetect</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-langdetect</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-langdetect-test-commons</artifactId>
+
<name>Apache Tika langdetect test commons</name>
<build>
@@ -44,8 +49,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-langdetect/tika-langdetect-tika/pom.xml b/tika-langdetect/tika-langdetect-tika/pom.xml
index 2ee040a9a..2c032aa3c 100644
--- a/tika-langdetect/tika-langdetect-tika/pom.xml
+++ b/tika-langdetect/tika-langdetect-tika/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,17 +18,20 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-langdetect</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-langdetect</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-langdetect-tika</artifactId>
- <name>Apache Tika langdetect (legacy builtin)</name>
+ <name>Apache Tika langdetect (legacy builtin)</name>
<dependencies>
<dependency>
@@ -38,12 +42,12 @@
<!-- test dependencies -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect-test-commons</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -58,8 +62,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index f7853970e..2da8d8112 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -770,6 +770,16 @@
<artifactId>lucene-core</artifactId>
<version>${lucene.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-memory</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>${solrj.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp-tools</artifactId>
@@ -1288,8 +1298,9 @@
<developerConnection>scm:git:https://github.com/apache/</developerConnection>
<url>https://github.com/apache/tika</url>
-->
+ <!-- FIXME: check if correct connection/developerConnection should be set -->
<scm>
- <tag>2.3.0-rc1</tag>
+ <tag>main</tag>
<connection>scm:git:https://github.com/apache/</connection>
<developerConnection>scm:git:https://github.com/apache/</developerConnection>
<url>https://github.com/apache/tika</url>
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index f6cdbe7e6..23cc1df1c 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +18,10 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika</artifactId>
@@ -25,12 +29,11 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>tika-parsers</artifactId>
+ <packaging>pom</packaging>
+
<name>Apache Tika parser modules</name>
- <packaging>pom</packaging>
<modules>
<!-- basic parsers - avoid network dependent parsers, native code -->
<module>tika-parsers-standard</module>
@@ -42,22 +45,9 @@
<dependencies>
<!-- test dependencies -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -97,8 +87,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-extended/pom.xml b/tika-parsers/tika-parsers-extended/pom.xml
index 2ee6c8e01..cd22bcded 100644
--- a/tika-parsers/tika-parsers-extended/pom.xml
+++ b/tika-parsers/tika-parsers-extended/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,17 +18,20 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parsers-extended</artifactId>
<packaging>pom</packaging>
+
<name>Apache Tika extended parsers</name>
<modules>
@@ -40,9 +44,8 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -85,8 +88,4 @@
</plugins>
</pluginManagement>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
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 f286b0852..3314eea57 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
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,24 +18,28 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-extended</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-extended</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-scientific-module</artifactId>
+
<name>Apache Tika scientific parser module</name>
<dependencies>
<!-- needed by AutoDetectReader in EnviHeaderParser -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-text-module</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-utility</artifactId>
@@ -87,7 +92,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
- <version>${commons.csv.version}</version>
</dependency>
<!-- for java 10
See TIKA-2778 for why we need to do this now.
@@ -96,7 +100,6 @@ May the gods of dependency management fix this in the future.
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>${jaxb.version}</version>
</dependency>
</dependencies>
@@ -132,11 +135,6 @@ May the gods of dependency management fix this in the future.
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-package/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-scientific-package/pom.xml
index 1e58213b0..57841c569 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-package/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-package/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,31 +18,30 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-extended</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-extended</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-scientific-package</artifactId>
- <name>Apache Tika scientific parser package</name>
-
- <properties>
- </properties>
+ <name>Apache Tika scientific parser package</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-scientific-module</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -122,10 +122,5 @@
</configuration>
</plugin>
</plugins>
-
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
index 1e005119a..7659bba89 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,29 +18,34 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-extended</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-extended</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-sqlite3-module</artifactId>
+
<name>Apache Tika sqlite3 parser module</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-jdbc-commons</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>${sqlite.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -62,8 +68,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/pom.xml
index 5d24fc6ed..53bcda286 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,25 +18,28 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-extended</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-extended</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-sqlite3-package</artifactId>
- <name>Apache Tika sqlite3 parser package</name>
+ <name>Apache Tika sqlite3 parser package</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-sqlite3-module</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -99,8 +103,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/pom.xml b/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/pom.xml
index b54eabcce..364ac51a1 100644
--- a/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,45 +18,46 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-extended</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-extended</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parsers-extended-integration-tests</artifactId>
+
<name>Apache Tika extended parser integration tests</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-scientific-module</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-sqlite3-package</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-sqlite3-module</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-scientific-module</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -72,8 +74,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-ml/pom.xml b/tika-parsers/tika-parsers-ml/pom.xml
index 6e3f1780e..fd807cf86 100644
--- a/tika-parsers/tika-parsers-ml/pom.xml
+++ b/tika-parsers/tika-parsers-ml/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +18,10 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
@@ -25,12 +29,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>tika-parsers-ml</artifactId>
+ <packaging>pom</packaging>
<name>Apache Tika machine learning (ml) parsers</name>
- <packaging>pom</packaging>
<modules>
<module>tika-parser-nlp-module</module>
@@ -46,12 +48,12 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<pluginManagement>
<plugins>
@@ -99,8 +101,4 @@
</plugins>
</pluginManagement>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
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 fe7e162c4..528527d20 100644
--- a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,20 +18,21 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-ml</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-age-recogniser</artifactId>
<packaging>jar</packaging>
<name>Apache Tika age recogniser</name>
- <url>http://maven.apache.org</url>
-
<!-- we're not maintaining this module.
Keep this here instead of cluttering the parent pom -->
@@ -124,6 +126,7 @@
</dependency>
</dependencies>
</dependencyManagement>
+
<dependencies>
<!-- AgePredictor client for Tika -->
<dependency>
@@ -153,6 +156,7 @@
</exclusion>
</exclusions>
</dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>org.mockito</groupId>
@@ -232,8 +236,4 @@
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
index d12002ec8..9ed2d72d4 100644
--- a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
@@ -19,17 +19,17 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-ml</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-dl</artifactId>
- <packaging>jar</packaging>
<name>Apache Tika Deep Learning (powered by DL4J)</name>
- <url>http://maven.apache.org</url>
<dependencies>
<dependency>
@@ -74,6 +74,7 @@
<version>${dl4j.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
@@ -127,11 +128,6 @@
<configuration>
</configuration>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml
index 20d337355..884e6bdd2 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,22 +18,25 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-ml</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-ml</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-advancedmedia-module</artifactId>
+
<name>Apache Tika advanced media module</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-audiovideo-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
@@ -78,8 +82,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-package/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-package/pom.xml
index 5115ca77b..39afdbf81 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-package/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-package/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,26 +18,25 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-ml</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-ml</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-advancedmedia-package</artifactId>
- <name>Apache Tika advanced media package</name>
-
- <properties>
- </properties>
+ <name>Apache Tika advanced media package</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-advancedmedia-module</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
@@ -108,8 +108,4 @@
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
index b7338c4a7..00154510f 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,180 +18,180 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>tika-parsers-ml</artifactId>
- <groupId>org.apache.tika</groupId>
- <version>2.6.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-ml</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tika-parser-nlp-module</artifactId>
- <artifactId>tika-parser-nlp-module</artifactId>
- <name>Apache Tika natural language process module</name>
+ <name>Apache Tika natural language process module</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parser-pdf-module</artifactId>
+ </dependency>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-pdf-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- Apache cTAKES -->
- <dependency>
- <groupId>org.apache.ctakes</groupId>
- <artifactId>ctakes-core</artifactId>
- <version>${ctakes.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.github.openjson</groupId>
- <artifactId>openjson</artifactId>
- <version>${openjson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-client</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
- <!-- sentiment parser -->
- <dependency>
- <groupId>edu.usc.ir</groupId>
- <artifactId>sentiment-analysis-parser</artifactId>
- <version>0.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-batch</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-translate</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-langdetect</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!-- Apache cTAKES -->
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-core</artifactId>
+ <version>${ctakes.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.github.openjson</groupId>
+ <artifactId>openjson</artifactId>
+ <version>${openjson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <!-- sentiment parser -->
+ <dependency>
+ <groupId>edu.usc.ir</groupId>
+ <artifactId>sentiment-analysis-parser</artifactId>
+ <version>0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-batch</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-translate</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-langdetect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <profile>
- <id>testSetup</id>
- <activation>
- <!-- auto activate -->
- <file>
- <missing>src/test/resources/org/apache/tika/parser/ner/opennlp/ner-person.bin</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- <version>${groovy.maven.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>3.8.6</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>2.4.21</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>testSetup</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>${basedir}/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy</source>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+ <profiles>
+ <profile>
+ <id>testSetup</id>
+ <activation>
+ <!-- auto activate -->
+ <file>
+ <missing>src/test/resources/org/apache/tika/parser/ner/opennlp/ner-person.bin</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>${groovy.maven.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>3.8.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>2.4.21</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>testSetup</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>${basedir}/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy</source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-package/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-nlp-package/pom.xml
index d1069aa1c..daf62dfad 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-package/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-package/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,26 +18,25 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-ml</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-ml</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-nlp-package</artifactId>
- <name>Apache Tika natural language processing package</name>
-
- <properties>
- </properties>
+ <name>Apache Tika natural language processing package</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-nlp-module</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
@@ -106,10 +106,5 @@
</executions>
</plugin>
</plugins>
-
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
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 d17fa18f6..fdb4227c3 100644
--- a/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml
@@ -23,15 +23,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>tika-parsers-ml</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-ml</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tika-transcribe-aws</artifactId>
<packaging>bundle</packaging>
+
<name>Apache Tika transcribe aws</name>
- <url>http://tika.apache.org/</url>
+
<!--TODO use latest aws version or the one defined in the tika-parent-->
<dependencies>
<dependency>
@@ -49,6 +51,7 @@
<artifactId>json-simple</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -130,8 +133,4 @@
</plugins>
</pluginManagement>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/pom.xml b/tika-parsers/tika-parsers-standard/pom.xml
index c4ed40c3f..b1323363c 100644
--- a/tika-parsers/tika-parsers-standard/pom.xml
+++ b/tika-parsers/tika-parsers-standard/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,25 +18,27 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>tika-parsers-standard</artifactId>
<packaging>pom</packaging>
- <name>Apache Tika standard parser modules and package</name>
+ <name>Apache Tika standard parser modules and package</name>
<modules>
<module>tika-parsers-standard-modules</module>
<module>tika-parsers-standard-package</module>
</modules>
+
<build>
<pluginManagement>
<plugins>
@@ -83,8 +86,4 @@
</plugins>
</pluginManagement>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
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 cf1b9310b..d7b5bbe03 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
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,32 +18,30 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>tika-parsers-standard-modules</artifactId>
<packaging>pom</packaging>
- <name>Apache Tika standard parser modules</name>
-
- <url>https://tika.apache.org/</url>
+ <name>Apache Tika standard parser modules</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
+
<modules>
<module>tika-parser-html-commons</module>
<module>tika-parser-jdbc-commons</module>
@@ -70,6 +69,7 @@
<module>tika-parser-crypto-module</module>
<module>tika-parser-webarchive-module</module>
</modules>
+
<build>
<pluginManagement>
<plugins>
@@ -108,8 +108,4 @@
</plugins>
</pluginManagement>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/pom.xml
index 1978c886b..b328d58de 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,30 +18,34 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-apple-module</artifactId>
+
<name>Apache Tika Apple parser module</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-zip-commons</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>com.googlecode.plist</groupId>
<artifactId>dd-plist</artifactId>
<version>${ddplist.version}</version>
</dependency>
-
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -63,8 +68,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/pom.xml
index 448dad9ed..3097cafbd 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,16 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-audiovideo-module</artifactId>
+
<name>Apache Tika audiovideo parser module</name>
<dependencies>
@@ -34,8 +38,8 @@
<groupId>com.drewnoakes</groupId>
<artifactId>metadata-extractor</artifactId>
</dependency>
-
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -58,8 +62,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/pom.xml
index a16c8fcbe..f6eeb4772 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,34 +18,34 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-cad-module</artifactId>
+
<name>Apache Tika cad parser module</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-microsoft-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
</dependency>
+
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -67,7 +68,4 @@
</plugin>
</plugins>
</build>
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/pom.xml
index 878beec9d..07785f5a9 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,24 +18,27 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-code-module</artifactId>
+
<name>Apache Tika code parser module</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-text-module</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.codelibs</groupId>
<artifactId>jhighlight</artifactId>
@@ -43,7 +47,6 @@
<dependency>
<groupId>org.ccil.cowan.tagsoup</groupId>
<artifactId>tagsoup</artifactId>
- <version>${tagsoup.version}</version>
</dependency>
<!-- WARNING: when you upgrade asm make sure that you update the
@@ -90,8 +93,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml
index 9809416a4..ac5867d56 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,16 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-crypto-module</artifactId>
+
<name>Apache Tika crypto parser module</name>
<dependencies>
@@ -39,6 +43,7 @@
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -61,8 +66,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml
index 46a8f792a..1d672379f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,16 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-digest-commons</artifactId>
+
<name>Apache Tika digest commons</name>
<dependencies>
@@ -42,10 +46,5 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
-
</dependencies>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml
index 3b05890b3..67b5e0ef5 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,18 +18,20 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-font-module</artifactId>
- <name>Apache Tika font parser module</name>
+ <name>Apache Tika font parser module</name>
<dependencies>
<dependency>
@@ -60,8 +63,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-commons/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-commons/pom.xml
index f7cf478ad..4a71260a6 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-commons/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-commons/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,15 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-html-commons</artifactId>
+
<name>Apache Tika html commons</name>
<dependencies>
@@ -35,6 +40,7 @@
<version>${boilerpipe.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -67,8 +73,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/pom.xml
index 21f69ff4d..f87291160 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,23 +18,25 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-html-module</artifactId>
+
<name>Apache Tika html parser module</name>
<dependencies>
<dependency>
<groupId>org.ccil.cowan.tagsoup</groupId>
<artifactId>tagsoup</artifactId>
- <version>${tagsoup.version}</version>
</dependency>
<dependency>
@@ -44,12 +47,12 @@
<!-- test scope -->
<!-- this is required for basic encoding detection -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-text-module</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -72,8 +75,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml
index 633ddcbe0..be588e2aa 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,27 +18,30 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-image-module</artifactId>
+
<name>Apache Tika image parser module</name>
<dependencies>
<dependency>
- <groupId>com.drewnoakes</groupId>
- <artifactId>metadata-extractor</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parser-xmp-commons</artifactId>
</dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-xmp-commons</artifactId>
- <version>${project.version}</version>
+ <groupId>com.drewnoakes</groupId>
+ <artifactId>metadata-extractor</artifactId>
</dependency>
<dependency>
<groupId>com.github.jai-imageio</groupId>
@@ -57,7 +61,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-xmp-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -92,8 +96,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-jdbc-commons/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-jdbc-commons/pom.xml
index f88219000..2ee27da65 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-jdbc-commons/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-jdbc-commons/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,19 +18,18 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-jdbc-commons</artifactId>
- <name>Apache Tika jdbc parser commons</name>
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+ <name>Apache Tika jdbc parser commons</name>
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-commons/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-commons/pom.xml
index ccc8f4b27..e87438c1c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-commons/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-commons/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,19 +18,20 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>tika-parser-mail-commons</artifactId>
- <name>Apache Tika mail commons</name>
+ <name>Apache Tika mail commons</name>
<dependencies>
<dependency>
@@ -43,8 +45,4 @@
<version>${mime4j.version}</version>
</dependency>
</dependencies>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/pom.xml
index 0b4bb492d..01aa534fb 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,53 +18,55 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-mail-module</artifactId>
+
<name>Apache Tika mail parser module</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-mail-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-text-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-html-module</artifactId>
- <version>${project.version}</version>
</dependency>
+
+ <!-- test dependencies -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-ocr-module</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-ocr-module</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -86,8 +89,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml
index 35a4cc3c4..6111290f3 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,43 +18,42 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-microsoft-module</artifactId>
+
<name>Apache Tika Microsoft parser module</name>
<dependencies>
<!-- needed for msg files -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-html-module</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- needed for msg files -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-text-module</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- needed for only for AbstractXML2003Parser, but it ensures that xerces
is used -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-xml-module</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- needed for msg files -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-mail-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.pff</groupId>
@@ -61,9 +61,8 @@
<version>${libpst.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-zip-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -86,11 +85,6 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
</dependency>
- <!-- needed by jackcess -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
<dependency>
<groupId>com.healthmarketscience.jackcess</groupId>
<artifactId>jackcess</artifactId>
@@ -119,6 +113,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -141,8 +136,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/pom.xml
index f4abf648c..b9ba08f0b 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,34 +18,39 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-miscoffice-module</artifactId>
+
<name>Apache Tika miscellaneous office format parser module</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-zip-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-text-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-xml-module</artifactId>
- <version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parser-xmp-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parser-zip-commons</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -65,11 +71,6 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-xmp-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
<build>
@@ -94,8 +95,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/pom.xml
index 751faad06..135c28d14 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,16 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-news-module</artifactId>
+
<name>Apache Tika news parser module</name>
<dependencies>
@@ -35,11 +39,8 @@
<artifactId>rome</artifactId>
<version>${rome.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -62,8 +63,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/pom.xml
index 0fe523db5..0ed7cef67 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,16 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-ocr-module</artifactId>
+
<name>Apache Tika OCR parser module</name>
<dependencies>
@@ -39,13 +43,14 @@
<artifactId>commons-exec</artifactId>
<version>${commons.exec.version}</version>
</dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-image-module</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -68,8 +73,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml
index 398630d23..38be3cf5f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,25 +18,27 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-pdf-module</artifactId>
- <name>Apache Tika PDF parser module</name>
+ <name>Apache Tika PDF parser module</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-xmp-commons</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
@@ -77,6 +80,8 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
+
+ <!-- test dependencies -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@@ -121,8 +126,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/pom.xml
index dbb2f54c4..e80d49149 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,20 +18,27 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-pkg-module</artifactId>
- <name>Apache Tika package parser module</name>
+ <name>Apache Tika package parser module</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parser-zip-commons</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
@@ -47,11 +55,6 @@
<version>${zstd.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-zip-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>com.github.junrar</groupId>
<artifactId>junrar</artifactId>
@@ -70,6 +73,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -92,8 +96,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/pom.xml
index 2fe463d0d..5cf7f43a4 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,16 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-text-module</artifactId>
+
<name>Apache Tika text parser module</name>
<dependencies>
@@ -78,8 +82,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/pom.xml
index bc19cfe94..52d86eb41 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,16 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-webarchive-module</artifactId>
+
<name>Apache Tika WARC parser module</name>
<dependencies>
@@ -38,17 +42,17 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
+
+ <!-- test dependencies -->
<!-- need these for detection/ungzipping and html parsing in tests -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-html-module</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-pkg-module</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -75,8 +79,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/pom.xml
index f62b3300d..7c14b7cc3 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,16 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-xml-module</artifactId>
+
<name>Apache Tika XML parser module</name>
<dependencies>
@@ -39,6 +43,7 @@
<artifactId>xercesImpl</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -61,8 +66,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml
index 7704d8aad..d275a6798 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,18 +18,20 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-xmp-commons</artifactId>
- <name>Apache Tika XMP commons</name>
+ <name>Apache Tika XMP commons</name>
<dependencies>
<dependency>
@@ -42,6 +45,7 @@
<version>${pdfbox.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -64,8 +68,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/pom.xml
index d35e6c3eb..7abf821a1 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,16 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard-modules</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-modules</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-parser-zip-commons</artifactId>
+
<name>Apache Tika ZIP commons</name>
<dependencies>
@@ -35,6 +39,7 @@
<artifactId>commons-compress</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -57,8 +62,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
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 b0f4592ed..993ca9708 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
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,18 +18,21 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-parsers-standard</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <name>Apache Tika standard parser package</name>
<artifactId>tika-parsers-standard-package</artifactId>
+ <name>Apache Tika standard parser package</name>
+
<dependencies>
<!-- Optional OSGi dependency, used only when running within OSGi -->
<dependency>
@@ -38,117 +42,97 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-apple-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-audiovideo-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-cad-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-code-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-crypto-module</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- skip db -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-digest-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-font-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-html-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-image-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-mail-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-microsoft-module</artifactId>
- <version>${project.version}</version>
</dependency>
- <!-- swap in jcl-over-slf4j -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-miscoffice-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-news-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-ocr-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-pdf-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-pkg-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-text-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-webarchive-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-xml-module</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-xmp-commons</artifactId>
- <version>${project.version}</version>
+ </dependency>
+
+ <!-- swap in jcl-over-slf4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<!-- externally maintained parsers -->
@@ -184,140 +168,133 @@
<version>${imageio.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-html-commons</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-zip-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-apple-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-audiovideo-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-cad-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-code-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-crypto-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-font-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-html-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-xml-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-image-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-mail-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-microsoft-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-miscoffice-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-news-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-ocr-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-pdf-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-pkg-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-text-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -336,11 +313,8 @@
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
-
-
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -452,11 +426,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/pom.xml b/tika-pipes/pom.xml
index ea3aba6d3..c059e0490 100644
--- a/tika-pipes/pom.xml
+++ b/tika-pipes/pom.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,6 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -25,10 +28,10 @@
</parent>
<artifactId>tika-pipes</artifactId>
- <name>Apache Tika pipes</name>
- <url>https://tika.apache.org/</url>
<packaging>pom</packaging>
+ <name>Apache Tika pipes</name>
+
<modules>
<module>tika-httpclient-commons</module>
<module>tika-fetchers</module>
@@ -85,8 +88,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-async-cli/pom.xml b/tika-pipes/tika-async-cli/pom.xml
index e7f0bc692..c0c375038 100644
--- a/tika-pipes/tika-async-cli/pom.xml
+++ b/tika-pipes/tika-async-cli/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,26 +18,27 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-async-cli</artifactId>
<name>Apache Tika Async CLI</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
</dependency>
+
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -46,19 +48,20 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
+
+ <!-- test dependencies -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-emitter-fs</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -129,8 +132,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-emitters/pom.xml b/tika-pipes/tika-emitters/pom.xml
index b6e01c190..6ea1accf1 100644
--- a/tika-pipes/tika-emitters/pom.xml
+++ b/tika-pipes/tika-emitters/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,20 +18,22 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-emitters</artifactId>
- <name>Apache Tika emitters</name>
- <url>https://tika.apache.org/</url>
<packaging>pom</packaging>
+ <name>Apache Tika emitters</name>
+
<modules>
<module>tika-emitter-fs</module>
<module>tika-emitter-s3</module>
@@ -41,8 +44,4 @@
<module>tika-emitter-az-blob</module>
<module>tika-emitter-jdbc</module>
</modules>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-emitters/tika-emitter-az-blob/pom.xml b/tika-pipes/tika-emitters/tika-emitter-az-blob/pom.xml
index 3f0184819..ecad051dd 100644
--- a/tika-pipes/tika-emitters/tika-emitter-az-blob/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-az-blob/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,30 +18,31 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-emitters</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-emitters</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-emitter-az-blob</artifactId>
- <name>Apache Tika Azure blob</name>
+ <name>Apache Tika Azure blob</name>
<dependencies>
<!-- should serialization be provided or bundled? -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -111,11 +113,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-emitters/tika-emitter-fs/pom.xml b/tika-pipes/tika-emitters/tika-emitter-fs/pom.xml
index 77008637e..f98f49058 100644
--- a/tika-pipes/tika-emitters/tika-emitter-fs/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-fs/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,29 +18,31 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-emitters</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-emitters</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-emitter-fs</artifactId>
+
<name>Apache Tika filesystem emitter</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<!-- should serialization be provided or bundled? -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -106,11 +109,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml b/tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml
index 9ef6547af..4d81bdc4a 100644
--- a/tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,30 +18,31 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-emitters</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-emitters</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-emitter-gcs</artifactId>
- <name>Apache Tika GCS emitter</name>
+ <name>Apache Tika GCS emitter</name>
<dependencies>
<!-- should serialization be provided or bundled? -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -111,11 +113,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/pom.xml b/tika-pipes/tika-emitters/tika-emitter-jdbc/pom.xml
index 5a0e15b30..55e79edfa 100644
--- a/tika-pipes/tika-emitters/tika-emitter-jdbc/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-jdbc/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,28 +18,32 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-emitters</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-emitters</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-emitter-jdbc</artifactId>
+
<name>Apache Tika jdbc emitter</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml b/tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml
index 624320ba1..639bb72b8 100644
--- a/tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,32 +18,34 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-emitters</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-emitters</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-emitter-kafka</artifactId>
- <name>Apache Tika Kafka emitter</name>
+ <name>Apache Tika Kafka emitter</name>
<dependencies>
<!-- should serialization be provided or bundled? -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
@@ -125,8 +128,4 @@
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml b/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml
index 64c0fd587..7b0dae42b 100644
--- a/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,54 +18,47 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-emitters</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-emitters</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-emitter-opensearch</artifactId>
+
<name>Apache Tika OpenSearch emitter</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-httpclient-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
</dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -135,8 +129,4 @@
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
index d80d39aa6..5a499b80b 100644
--- a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,36 +18,39 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-emitters</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-emitters</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-emitter-s3</artifactId>
- <name>Apache Tika S3 emitter</name>
+ <name>Apache Tika S3 emitter</name>
<dependencies>
<!-- should serialization be provided or bundled? -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
@@ -116,11 +120,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml b/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
index 752db1ec5..81ce0a611 100644
--- a/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,39 +18,42 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-emitters</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-emitters</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-emitter-solr</artifactId>
+
<name>Apache Tika Apache Solr emitter</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-httpclient-commons</artifactId>
- <version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${solrj.version}</version>
- </dependency>
</dependencies>
<build>
@@ -114,11 +118,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-fetchers/pom.xml b/tika-pipes/tika-fetchers/pom.xml
index bccb2f35a..8c5533d2c 100644
--- a/tika-pipes/tika-fetchers/pom.xml
+++ b/tika-pipes/tika-fetchers/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,31 +18,26 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-fetchers</artifactId>
- <name>Apache Tika fetchers</name>
- <url>https://tika.apache.org/</url>
<packaging>pom</packaging>
+ <name>Apache Tika fetchers</name>
+
<modules>
<module>tika-fetcher-http</module>
<module>tika-fetcher-s3</module>
<module>tika-fetcher-gcs</module>
<module>tika-fetcher-az-blob</module>
</modules>
-
- <dependencies>
-
- </dependencies>
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-az-blob/pom.xml
index 425a719cf..509136beb 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/pom.xml
+++ b/tika-pipes/tika-fetchers/tika-fetcher-az-blob/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,110 +18,108 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>tika-fetchers</artifactId>
- <groupId>org.apache.tika</groupId>
- <version>2.6.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-fetchers</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <artifactId>tika-fetcher-az-blob</artifactId>
- <name>Apache Tika Azure Blob fetcher</name>
+ <artifactId>tika-fetcher-az-blob</artifactId>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-storage-blob</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <name>Apache Tika Azure Blob fetcher</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>org.apache.tika.pipes.fetcher.azblob</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${maven.shade.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>
- false
- </createDependencyReducedPom>
- <!-- <filters> -->
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>NOTICE.txt</exclude>
- </excludes>
- </filter>
- </filters>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/LICENSE</resource>
- <file>target/classes/META-INF/LICENSE</file>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/NOTICE</resource>
- <file>target/classes/META-INF/NOTICE</file>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/DEPENDENCIES</resource>
- <file>target/classes/META-INF/DEPENDENCIES</file>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-blob</artifactId>
+ </dependency>
- </plugins>
- </build>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-serialization</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.pipes.fetcher.azblob</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>
+ false
+ </createDependencyReducedPom>
+ <!-- <filters> -->
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/LICENSE</resource>
+ <file>target/classes/META-INF/LICENSE</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/NOTICE</resource>
+ <file>target/classes/META-INF/NOTICE</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/DEPENDENCIES</resource>
+ <file>target/classes/META-INF/DEPENDENCIES</file>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml
index 5ca84d48a..0fd2e1b4d 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml
+++ b/tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,97 +18,95 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>tika-fetchers</artifactId>
- <groupId>org.apache.tika</groupId>
- <version>2.6.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>tika-fetcher-gcs</artifactId>
- <name>Apache Tika Google Cloud Storage fetcher</name>
+ <parent>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-fetchers</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.google.cloud</groupId>
- <artifactId>google-cloud-storage</artifactId>
- </dependency>
- </dependencies>
+ <artifactId>tika-fetcher-gcs</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>org.apache.tika.pipes.fetcher.gcs</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${maven.shade.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>
- false
- </createDependencyReducedPom>
- <!-- <filters> -->
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>NOTICE.txt</exclude>
- </excludes>
- </filter>
- </filters>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/LICENSE</resource>
- <file>target/classes/META-INF/LICENSE</file>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/NOTICE</resource>
- <file>target/classes/META-INF/NOTICE</file>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/DEPENDENCIES</resource>
- <file>target/classes/META-INF/DEPENDENCIES</file>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <name>Apache Tika Google Cloud Storage fetcher</name>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.cloud</groupId>
+ <artifactId>google-cloud-storage</artifactId>
+ </dependency>
+ </dependencies>
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.pipes.fetcher.gcs</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>
+ false
+ </createDependencyReducedPom>
+ <!-- <filters> -->
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/LICENSE</resource>
+ <file>target/classes/META-INF/LICENSE</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/NOTICE</resource>
+ <file>target/classes/META-INF/NOTICE</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/DEPENDENCIES</resource>
+ <file>target/classes/META-INF/DEPENDENCIES</file>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
index 65086b816..7b2a9c4ec 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
+++ b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,38 +18,41 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-fetchers</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-fetchers</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-fetcher-http</artifactId>
+
<name>Apache Tika http fetcher</name>
<dependencies>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-httpclient-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -123,8 +127,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
index b0abb91b7..5e58921ed 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
+++ b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,102 +18,101 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>tika-fetchers</artifactId>
- <groupId>org.apache.tika</groupId>
- <version>2.6.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-fetchers</artifactId>
+ <version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <artifactId>tika-fetcher-s3</artifactId>
- <name>Apache Tika S3 fetcher</name>
+ <artifactId>tika-fetcher-s3</artifactId>
- <dependencies>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-s3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <name>Apache Tika S3 fetcher</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>org.apache.tika.pipes.fetcher.s3</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${maven.shade.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>
- false
- </createDependencyReducedPom>
- <!-- <filters> -->
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>NOTICE.txt</exclude>
- </excludes>
- </filter>
- </filters>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/LICENSE</resource>
- <file>target/classes/META-INF/LICENSE</file>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/NOTICE</resource>
- <file>target/classes/META-INF/NOTICE</file>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/DEPENDENCIES</resource>
- <file>target/classes/META-INF/DEPENDENCIES</file>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-s3</artifactId>
+ </dependency>
- </plugins>
- </build>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.pipes.fetcher.s3</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>
+ false
+ </createDependencyReducedPom>
+ <!-- <filters> -->
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/LICENSE</resource>
+ <file>target/classes/META-INF/LICENSE</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/NOTICE</resource>
+ <file>target/classes/META-INF/NOTICE</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/DEPENDENCIES</resource>
+ <file>target/classes/META-INF/DEPENDENCIES</file>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/tika-pipes/tika-httpclient-commons/pom.xml b/tika-pipes/tika-httpclient-commons/pom.xml
index 18b068aa0..19253b81a 100644
--- a/tika-pipes/tika-httpclient-commons/pom.xml
+++ b/tika-pipes/tika-httpclient-commons/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,32 +18,31 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-pipes</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-pipes</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-httpclient-commons</artifactId>
+
<name>Apache Tika httpclient commons</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
</dependencies>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-pipes/tika-pipes-iterators/pom.xml b/tika-pipes/tika-pipes-iterators/pom.xml
index 245a2cb77..15e60acfd 100644
--- a/tika-pipes/tika-pipes-iterators/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,20 +18,22 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-iterators</artifactId>
- <name>Apache Tika Pipes Iterators</name>
- <url>https://tika.apache.org/</url>
<packaging>pom</packaging>
+ <name>Apache Tika Pipes Iterators</name>
+
<!-- see also org.apache.tika.pipes.pipesiterator.fs.FileSystemIterator
in tika-core if you want a file system directory crawler -->
<modules>
@@ -42,8 +45,4 @@
<module>tika-pipes-iterator-gcs</module>
<module>tika-pipes-iterator-az-blob</module>
</modules>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/pom.xml
index bfd477258..f60f33442 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,32 +18,34 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-iterators</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-iterator-az-blob</artifactId>
<name>Apache Tika Pipes Iterator - Azure Blob Storage</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -105,11 +108,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml
index aad84fe46..f7abc6240 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,32 +18,34 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-iterators</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-iterator-csv</artifactId>
<name>Apache Tika Pipes Iterator - CSV</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -115,11 +118,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/pom.xml
index 150f2def2..2ec45f59c 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,32 +18,34 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-iterators</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-iterator-gcs</artifactId>
<name>Apache Tika Pipes Iterator - Google Cloud Storage</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -105,11 +108,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/pom.xml
index 8cbc9178b..bb6c5cec5 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,33 +18,36 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-iterators</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-iterator-jdbc</artifactId>
<name>Apache Tika Pipes Iterator - JDBC</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- test dependencies -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -106,11 +110,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml
index 1eee68d01..80afb522f 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,25 +18,25 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-iterators</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-iterator-kafka</artifactId>
<name>Apache Tika Pipes Iterator - Kafka</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -43,16 +44,14 @@
<artifactId>kafka-clients</artifactId>
<version>${kafka.version}</version>
</dependency>
+
+ <!-- TODO: should it be provided? -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -115,11 +114,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
index 1c10444a2..df4596662 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,37 +18,40 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-iterators</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-iterator-s3</artifactId>
<name>Apache Tika Pipes Iterator - S3</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -110,11 +114,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/pom.xml
index f20aaa98b..0cdbaaf8d 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,38 +18,38 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-iterators</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-iterator-solr</artifactId>
<name>Apache Tika Pipes Iterator - Solr</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${solrj.version}</version>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-httpclient-commons</artifactId>
</dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-httpclient-commons</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -111,11 +112,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-pipes-reporters/pom.xml b/tika-pipes/tika-pipes-reporters/pom.xml
index 4f4c5e917..c9b34d031 100644
--- a/tika-pipes/tika-pipes-reporters/pom.xml
+++ b/tika-pipes/tika-pipes-reporters/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,27 +18,25 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-reporters</artifactId>
- <name>Apache Tika Pipes Reporters</name>
- <url>https://tika.apache.org/</url>
<packaging>pom</packaging>
+ <name>Apache Tika Pipes Reporters</name>
+
<modules>
<module>tika-pipes-reporter-opensearch</module>
<module>tika-pipes-reporter-fs-status</module>
<module>tika-pipes-reporter-jdbc</module>
</modules>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/pom.xml b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/pom.xml
index 9a8c3752f..164032dab 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/pom.xml
+++ b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,27 +18,28 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-reporters</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-reporter-fs-status</artifactId>
<name>Apache Tika Pipes Reporter - FileSystem Status Reporter</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -47,7 +49,7 @@
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
- <!-- logging -->
+ <!-- test dependencies -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@@ -59,18 +61,17 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-emitter-fs</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -133,11 +134,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/pom.xml b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/pom.xml
index c2d990596..05473d07f 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/pom.xml
+++ b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,33 +18,35 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-reporters</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-reporter-jdbc</artifactId>
<name>Apache Tika Pipes Reporter - JDBC Pipes Reporter</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -109,8 +112,4 @@
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/pom.xml b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/pom.xml
index 5c250eceb..cbd8cf97f 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/pom.xml
+++ b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,37 +18,37 @@
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-pipes-reporters</artifactId>
<version>2.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-pipes-reporter-opensearch</artifactId>
<name>Apache Tika Pipes Reporter - OpenSearch</name>
- <url>https://tika.apache.org/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-httpclient-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -110,11 +111,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-serialization/pom.xml b/tika-serialization/pom.xml
index d12582ebf..9fe333c02 100644
--- a/tika-serialization/pom.xml
+++ b/tika-serialization/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--
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
@@ -30,32 +30,30 @@
</parent>
<artifactId>tika-serialization</artifactId>
+
<name>Apache Tika serialization</name>
- <url>https://tika.apache.org</url>
<dependencies>
- <!-- Optional OSGi dependency, used only when running within OSGi -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
+
+ <!-- Optional OSGi dependency, used only when running within OSGi -->
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -108,8 +106,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index 1fcbd7316..f65f616c1 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,14 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <modules>
- <module>tika-server-core</module>
- <module>tika-server-standard</module>
- <module>tika-server-client</module>
- <module>tika-server-eval</module>
- </modules>
<parent>
<groupId>org.apache.tika</groupId>
@@ -31,9 +28,17 @@
</parent>
<artifactId>tika-server</artifactId>
- <name>Apache Tika server module</name>
- <url>https://tika.apache.org/</url>
<packaging>pom</packaging>
+
+ <name>Apache Tika server module</name>
+
+ <modules>
+ <module>tika-server-core</module>
+ <module>tika-server-standard</module>
+ <module>tika-server-client</module>
+ <module>tika-server-eval</module>
+ </modules>
+
<build>
<plugins>
<plugin>
@@ -68,8 +73,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-server/tika-server-client/pom.xml b/tika-server/tika-server-client/pom.xml
index e7ea645cd..eb152429a 100644
--- a/tika-server/tika-server-client/pom.xml
+++ b/tika-server/tika-server-client/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,46 +16,42 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-server</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-server</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-server-client</artifactId>
+
<name>Apache Tika server client</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-httpclient-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpcomponents.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-emitter-fs</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -128,8 +125,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-server/tika-server-core/pom.xml b/tika-server/tika-server-core/pom.xml
index 85fac2f4c..df6a0bb9d 100644
--- a/tika-server/tika-server-core/pom.xml
+++ b/tika-server/tika-server-core/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,16 +16,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-server</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-server</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>tika-server-core</artifactId>
+
<name>Apache Tika server core</name>
<pluginRepositories>
@@ -37,36 +41,30 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-translate</artifactId>
- <version>${project.version}</version>
</dependency>
-
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect-optimaize</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-html-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-digest-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parser-zip-commons</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
@@ -100,32 +98,33 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
+
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-emitter-fs</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- </dependency>
</dependencies>
<build>
@@ -326,8 +325,4 @@
</build>
</profile>
</profiles>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-server/tika-server-eval/pom.xml b/tika-server/tika-server-eval/pom.xml
index 820ac6482..9223ca78c 100644
--- a/tika-server/tika-server-eval/pom.xml
+++ b/tika-server/tika-server-eval/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,15 +16,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-server</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-server</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-server-eval</artifactId>
+
<name>Apache Tika server tika-eval handler</name>
<properties>
@@ -33,14 +38,12 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-eval-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-server-core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -138,7 +141,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-server/tika-server-standard/pom.xml b/tika-server/tika-server-standard/pom.xml
index d6975a12d..90a74a460 100644
--- a/tika-server/tika-server-standard/pom.xml
+++ b/tika-server/tika-server-standard/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,55 +16,39 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>tika-server</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-server</artifactId>
<version>2.6.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tika-server-standard</artifactId>
- <name>Apache Tika standard server</name>
+ <name>Apache Tika standard server</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-server-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
- <version>${project.version}</version>
- <!-- this is brought in by tika-server-core. Don't duplicate -->
- <exclusions>
- <exclusion>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parser-digest-commons</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parser-zip-commons</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parser-html-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>tika-xmp</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-emitter-fs</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@@ -72,28 +57,27 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
+
<!-- test jars -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-server-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect-opennlp</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -317,8 +301,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index a13b74056..8d2e2a503 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -31,34 +31,34 @@
<artifactId>tika-translate</artifactId>
<packaging>bundle</packaging>
+
<name>Apache Tika translate</name>
- <url>https://tika.apache.org/</url>
+ <description>
+ This is the translate Apache Tika™ toolkit. Translator implementations may depend on web services.
+ </description>
<dependencies>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect-optimaize</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.memetix</groupId>
<artifactId>microsoft-translator-java-api</artifactId>
<version>${microsoft.translator.version}</version>
- <type>jar</type>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
</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.
- -->
+ See TIKA-2778 for why we need to do this now.
+ May the gods of dependency management fix this in the future.
+ -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
@@ -91,10 +91,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -113,6 +109,7 @@
<version>2.0.2</version>
</dependency>
</dependencies>
+
<reporting>
<plugins>
<plugin>
@@ -140,6 +137,7 @@
</plugin>
</plugins>
</reporting>
+
<build>
<plugins>
<plugin>
@@ -225,27 +223,7 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
-
</plugins>
</pluginManagement>
</build>
-
- <description>This is the translate Apache Tika™ toolkit. Translator implementations may depend on web services.
- </description>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/TIKA</url>
- </issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/Tika-trunk/</url>
- </ciManagement>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
diff --git a/tika-xmp/pom.xml b/tika-xmp/pom.xml
index 89e5a9070..a687d6be3 100644
--- a/tika-xmp/pom.xml
+++ b/tika-xmp/pom.xml
@@ -31,8 +31,31 @@
<artifactId>tika-xmp</artifactId>
<packaging>bundle</packaging>
+
<name>Apache Tika XMP</name>
- <url>https://tika.apache.org/</url>
+ <description>
+ Converts Tika metadata to XMP
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parser-microsoft-module</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parser-miscoffice-module</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.xmp</groupId>
+ <artifactId>xmpcore</artifactId>
+ <version>${xmpcore.version}</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
@@ -77,45 +100,4 @@
</plugin>
</plugins>
</build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-microsoft-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-miscoffice-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.adobe.xmp</groupId>
- <artifactId>xmpcore</artifactId>
- <version>${xmpcore.version}</version>
- </dependency>
- </dependencies>
-
- <description>Converts Tika metadata to XMP</description>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/TIKA</url>
- </issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/Tika-trunk/</url>
- </ciManagement>
-
- <scm>
- <tag>2.2.1-rc2</tag>
- </scm>
</project>
[tika] 05/06: Turn off enforcer plugin in the `tika-age-recognizer`
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a commit to branch build-refactoring
in repository https://gitbox.apache.org/repos/asf/tika.git
commit ad7d63d9c7de1f6c7148de61e44efaaf94335513
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Thu Nov 17 18:36:03 2022 +0300
Turn off enforcer plugin in the `tika-age-recognizer`
---
tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
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 528527d20..9a339c580 100644
--- a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
@@ -233,7 +233,15 @@
</execution>
</executions>
</plugin>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M3</version>
+ <configuration>
+ <!-- tika-age-recognizer is unsupported, skip it -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
[tika] 03/06: TIKA-3934 Move enforcer plugin configuration to the `tika` (reactor)
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a commit to branch build-refactoring
in repository https://gitbox.apache.org/repos/asf/tika.git
commit a52a2d4ce82abc4e90e07bb36d9aee623f4997ef
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Sat Nov 19 23:39:06 2022 +0300
TIKA-3934 Move enforcer plugin configuration to the `tika` (reactor)
---
pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++
tika-parent/pom.xml | 38 --------------------------------------
2 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index 02df9b853..d88d1be6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,12 @@
<module>tika-detectors</module>
</modules>
+ <properties>
+ <!-- versions for enforcer plugin configured in org.apache:apache grandparent POM -->
+ <minimalMavenBuildVersion>3.5</minimalMavenBuildVersion>
+ <minimalJavaBuildVersion>1.8</minimalJavaBuildVersion>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -274,6 +280,40 @@ least three +1 Tika PMC votes are cast.
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M3</version> <!-- can't update to 3.1.0, see MENFORCER-393 -->
+ <executions>
+ <execution>
+ <id>enforce-dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <dependencyConvergence />
+ </rules>
+ </configuration>
+ </execution>
+ <execution>
+ <id>ban-bad-log4j-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>org.apache.logging.log4j:log4j-core:(,2.17.1)</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 2da8d8112..b766c2224 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -1120,44 +1120,6 @@
</dependency>
</dependencies>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version> <!-- can't update to 3.1.0, see MENFORCER-393 -->
- <executions>
- <execution>
- <id>enforce-maven</id>
- <configuration>
- <rules>
- <dependencyConvergence />
- <requireMavenVersion>
- <version>3.5</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- <execution>
- <id>ban-bad-log4j-versions</id>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <bannedDependencies>
- <excludes>
- <exclude>org.apache.logging.log4j:log4j-core:(,2.17.1)</exclude>
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<!-- mvn validate -->
<groupId>org.apache.maven.plugins</groupId>
[tika] 04/06: Ban commons-logging except in test scope
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a commit to branch build-refactoring
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 348a83438f974a6936a5cdbd194756f6e255089c
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Sat Nov 19 23:39:40 2022 +0300
Ban commons-logging except in test scope
---
pom.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/pom.xml b/pom.xml
index d88d1be6a..f0d0e3627 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,6 +312,25 @@ least three +1 Tika PMC votes are cast.
<fail>true</fail>
</configuration>
</execution>
+ <execution>
+ <id>ban-commons-logging</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>commons-logging:commons-logging</exclude>
+ </excludes>
+ <includes>
+ <include>commons-logging:commons-logging:*:jar:test</include>
+ </includes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>