Skip to content

TIKA-4540 -- First steps - WIP #2390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tballison wants to merge 5 commits into
base: main
Choose a base branch
from
+378 −434
Draft

TIKA-4540 -- First steps - WIP #2390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3c9a15
TIKA-4540 -- First steps - WIP
tballison Nov 10, 2025
9b4a0ad
TIKA-4540 -- try to update to nisse
tballison Nov 10, 2025
4bd175b
TIKA-4540 -- try to set eclipseP2RepoId to something meaningless
tballison Nov 10, 2025
bebc380
Minimal changes to make build work with Maven 4 (#2391)
cstamas Nov 10, 2025
eb1ec8f
revert incorrect placement for nisse
tballison Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<extension>
<groupId>eu.maveniverse.maven.nisse</groupId>
<artifactId>extension</artifactId>
<version>0.6.2</version>
</extension>
</extensions>
5 changes: 5 additions & 0 deletions .mvn/maven.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-D
nisse.compat.osDetector
# fix for nlp module
-D
eclipseP2RepoId=invalid
47 changes: 23 additions & 24 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,42 +19,41 @@
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>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>

<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>tika-parent/pom.xml</relativePath>
</parent>

<artifactId>tika</artifactId>
<packaging>pom</packaging>
<name>Apache Tika</name>
<url>https://tika.apache.org</url>

<modules>
<module>tika-parent</module>
<module>tika-bom</module>
<module>tika-core</module>
<module>tika-serialization</module>
<module>tika-detectors</module>
<module>tika-parsers</module>
<module>tika-bundles</module>
<module>tika-xmp</module>
<module>tika-langdetect</module>
<module>tika-pipes</module>
<module>tika-grpc</module>
<module>tika-app</module>
<module>tika-server</module>
<module>tika-integration-tests</module>
<module>tika-eval</module>
<module>tika-translate</module>
<module>tika-example</module>
<module>tika-java7</module>
<module>tika-handlers</module>
</modules>
<subprojects>
<subproject>tika-parent</subproject>
<subproject>tika-bom</subproject>
<subproject>tika-core</subproject>
<subproject>tika-serialization</subproject>
<subproject>tika-detectors</subproject>
<subproject>tika-parsers</subproject>
<subproject>tika-bundles</subproject>
<subproject>tika-xmp</subproject>
<subproject>tika-langdetect</subproject>
<subproject>tika-pipes</subproject>
<subproject>tika-grpc</subproject>
<subproject>tika-app</subproject>
<subproject>tika-server</subproject>
<subproject>tika-integration-tests</subproject>
<subproject>tika-eval</subproject>
<subproject>tika-translate</subproject>
<subproject>tika-example</subproject>
<subproject>tika-java7</subproject>
<subproject>tika-handlers</subproject>
</subprojects>

<profiles>
<profile>
Expand Down
5 changes: 2 additions & 3 deletions tika-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
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>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
Copy link
Member

@cstamas cstamas Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for model version change, Maven 4 is happy with model 4.0 as well. Worth keeping it at model version 4.0 if you want to keep both, ability to build with Maven 3 and Maven 4. Once only Maven 4 is used, you can up model as well (of course, if you do want new features and insist on Maven4-only, model change is okay too, but then Maven 3 is not usable anymore to build Tika)

Copy link
Contributor Author

@tballison tballison Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was done automatically by mvnup

Copy link
Contributor Author

@tballison tballison Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now, I see because of the settings I used, based on the documentation for upgrading.


<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

<artifactId>tika-app</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions tika-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@
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>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>

<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

<artifactId>tika-bom</artifactId>
Expand Down
11 changes: 5 additions & 6 deletions tika-bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,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">
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<parent>
<artifactId>tika-parent</artifactId>
<groupId>org.apache.tika</groupId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.1.0</modelVersion>

<artifactId>tika-bundles</artifactId>
<version>4.0.0-SNAPSHOT</version>
<name>Apache Tika bundles module</name>

<packaging>pom</packaging>

<modules>
<module>tika-bundle-standard</module>
</modules>
<subprojects>
Copy link
Member

@cstamas cstamas Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IF you remain on model 4.0 (to allow both, use of Maven 3 and Maven 4 to build Tika) undo this.

Copy link
Contributor Author

@tballison tballison Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that was done by mvnup automatically. Should I undo that throughout?

<subproject>tika-bundle-standard</subproject>
</subprojects>

<build>
<plugins>
Expand Down
7 changes: 3 additions & 4 deletions tika-bundles/tika-bundle-standard/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@
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>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>

<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-bundles</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>tika-bundle-standard</artifactId>
Expand Down Expand Up @@ -359,7 +358,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>pre-integration-test</phase>
<phase>before:integration-test</phase>
<goals>
<goal>single</goal>
</goals>
Expand Down
5 changes: 2 additions & 3 deletions tika-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
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>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>

<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

<artifactId>tika-core</artifactId>
Expand Down
13 changes: 6 additions & 7 deletions tika-detectors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,21 @@
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>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>

<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

<artifactId>tika-detectors</artifactId>
<packaging>pom</packaging>
<name>Apache Tika Detectors</name>

<modules>
<module>tika-detector-siegfried</module>
<module>tika-detector-magika</module>
</modules>
<subprojects>
<subproject>tika-detector-siegfried</subproject>
<subproject>tika-detector-magika</subproject>
</subprojects>
</project>
4 changes: 2 additions & 2 deletions tika-detectors/tika-detector-magika/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
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">
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<parent>
<artifactId>tika-detectors</artifactId>
<groupId>org.apache.tika</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.1.0</modelVersion>

<artifactId>tika-detector-magika</artifactId>
<name>Apache Tika magika wrapper</name>
Expand Down
4 changes: 2 additions & 2 deletions tika-detectors/tika-detector-siegfried/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
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">
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<parent>
<artifactId>tika-detectors</artifactId>
<groupId>org.apache.tika</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.1.0</modelVersion>

<artifactId>tika-detector-siegfried</artifactId>
<name>Apache Tika Siegfried wrapper</name>
Expand Down
13 changes: 6 additions & 7 deletions tika-eval/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,23 @@
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>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

<artifactId>tika-eval</artifactId>
<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>
</modules>
<subprojects>
<subproject>tika-eval-core</subproject>
<subproject>tika-eval-app</subproject>
</subprojects>

<build>
<plugins>
Expand Down
4 changes: 2 additions & 2 deletions tika-eval/tika-eval-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
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">
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<parent>
<artifactId>tika-eval</artifactId>
<groupId>org.apache.tika</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.1.0</modelVersion>

<artifactId>tika-eval-app</artifactId>
<name>Apache Tika eval application</name>
Expand Down
4 changes: 2 additions & 2 deletions tika-eval/tika-eval-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
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">
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<parent>
<artifactId>tika-eval</artifactId>
<groupId>org.apache.tika</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.1.0</modelVersion>
<artifactId>tika-eval-core</artifactId>
<name>Apache Tika eval core</name>

Expand Down
5 changes: 2 additions & 3 deletions tika-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
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>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>

<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

<artifactId>tika-example</artifactId>
Expand Down
12 changes: 2 additions & 10 deletions tika-grpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<artifactId>tika-grpc</artifactId>
<packaging>jar</packaging>
<!-- Feel free to delete the comment at the end of these lines. It is just
Expand All @@ -30,7 +30,6 @@
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

<properties>
Expand Down Expand Up @@ -246,13 +245,6 @@
</dependency>
</dependencies>
<build>
<extensions>
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.7.1</version>
</extension>
</extensions>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
11 changes: 5 additions & 6 deletions tika-handlers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<parent>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../tika-parent/pom.xml</relativePath>
</parent>

<artifactId>tika-handlers</artifactId>

<name>Apache Tika handlers</name>
<packaging>pom</packaging>

<modules>
<module>tika-handler-boilerpipe</module>
</modules>
<subprojects>
<subproject>tika-handler-boilerpipe</subproject>
</subprojects>

<dependencies>
<dependency>
Expand Down
Loading
Loading