Merge branch 'main' of https://gitbox.apache.org/repos/asf/tika

Author: THausherr

CHANGES.txt

@@ -1,8 +1,8 @@
-Release 4.0.0-BETA1 - ???
+Release 4.0.0-alpha-1 - 5/4/2026
 
   BREAKING CHANGES
 
-   * Moved towards default json based configuration (TIKA-4544 and many others).
+   * Move from xml to json based configuration (TIKA-4544 and many others).
 
    * tika-pipes implementation modules have been reorganized by
      resource (tika-pipes-solr) vs task (tika-pipes-fetcher-solr)
@@ -39,9 +39,14 @@ Release 4.0.0-BETA1 - ???
 
    * Fix concurrency bug in TikaToXMP (TIKA-4393)
 
-Release 3.3.0 - ???
+Release 3.3.0 - 3/18/2026
 
-  * Various fixes based on regression testing (TIKA-4563).
+  * Switch to poi-ooxml-full (TIKA-4563).
+
+  * Users need to add "allowAbsolutePaths=true" for the FileSystemFetcher to fetch
+    an absolute path (TIKA-4649).
+
+  * Add a markdown option for content handlers (TIKA-4563).
 
   * Improve zip parsing (TIKA-4650).
 
@@ -57,14 +62,15 @@ Release 3.3.0 - ???
 
   * Improve extraction of Javascript from PDFs (TIKA-4465).
 
-Release 3.2.3 - ???
+Release 3.2.3 - 9/11/2025
 
   * Allow backwards compatibility with versions of commons-compress before 1.28.0 (TIKA-4469).
 
   * Fix XFA parsing within PDFs when woodstox is on the classpath as in tika-server (TIKA-4482).
 
   * Dependency updates.
 
+
 Release 3.2.2 - 8/6/2025
 
   * Fix for CVE-2025-54988.

tika-bom/pom.xml

@@ -51,6 +51,7 @@
     <connection>scm:git:https://github.com/apache/tika.git</connection>
     <developerConnection>scm:git:https://github.com/apache/tika.git</developerConnection>
     <url>https://github.com/apache/tika</url>
+    <tag>HEAD</tag>
   </scm>
 
   <distributionManagement>

tika-core/src/test/java/org/apache/tika/TikaIT.java

@@ -27,8 +27,10 @@ public class TikaIT {
     public void testToString() {
         String version = new Tika().toString();
         assertNotNull(version);
-        assertTrue(
-                version.matches("Apache Tika \\d+\\.\\d+\\.\\d+(-(?:ALPHA|BETA)\\d*)?(?:-SNAPSHOT)?"));
+        assertTrue(version.matches(
+                "Apache Tika \\d+\\.\\d+\\.\\d+"
+                        + "(?:-(?:ALPHA|BETA)\\d*|-(?:alpha|beta|milestone|rc)-\\d+)?"
+                        + "(?:-SNAPSHOT)?"));
     }
 
 }

tika-ml/tika-ml-chardetect/pom.xml

@@ -134,9 +134,9 @@
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                       <mainClass>org.apache.tika.ml.chardetect.tools.TrainNaiveBayesBigram</mainClass>
                     </transformer>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
                   </transformers>
                   <filters>
                     <filter>

tika-ml/tika-ml-junkdetect/pom.xml

@@ -135,9 +135,9 @@
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                       <mainClass>org.apache.tika.ml.junkdetect.tools.TrainJunkModel</mainClass>
                     </transformer>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
                   </transformers>
                   <filters>
                     <filter>

tika-parent/pom.xml

@@ -19,15 +19,14 @@
   under the License.
 -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         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.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</groupId>
     <artifactId>apache</artifactId>
     <version>37</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <groupId>org.apache.tika</groupId>
@@ -140,7 +139,7 @@
       <organization>NASA Jet Propulsion Laboratory</organization>
       <organizationUrl>http://www.jpl.nasa.gov</organizationUrl>
       <timezone>-8</timezone>
-      <properties/>
+      <properties />
       <roles>
         <role>committer</role>
       </roles>
@@ -150,7 +149,7 @@
       <id>mikemccand</id>
       <email>mikemccand@apache.org</email>
       <organization>IBM</organization>
-      <properties/>
+      <properties />
       <roles>
         <role>committer</role>
       </roles>
@@ -289,7 +288,7 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
-    <project.build.outputTimestamp>2026-02-01T00:00:00Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2026-05-04T23:37:57Z</project.build.outputTimestamp>
     <!-- plugin versions -->
     <!-- updates may not be detected by the maven versions plugin:
          https://github.com/mojohaus/versions/issues/1070 -->
@@ -467,12 +466,12 @@
     <maven.exec.version>3.6.3</maven.exec.version>
 
     <!-- needs to exist even if empty due to problems with jacoco-maven-plugin -->
-    <addmod/>
+    <addmod />
     <!-- This is a default value to avoid problems when running single tests
           see also https://stackoverflow.com/a/28695766/535646
           https://maven.apache.org/surefire/maven-surefire-plugin/faq.html#late-property-evaluation
     -->
-    <surefireArgLine/>
+    <surefireArgLine />
   </properties>
 
   <dependencyManagement>
@@ -1523,7 +1522,7 @@
             <id>enforce-maven</id>
             <configuration>
               <rules>
-                <dependencyConvergence/>
+                <dependencyConvergence />
                 <requireMavenVersion>
                   <version>3.5</version>
                 </requireMavenVersion>
@@ -1607,7 +1606,7 @@
               <spaces>true</spaces>
               <spacesPerTab>4</spacesPerTab>
             </indent>
-            <removeUnusedImports/>
+            <removeUnusedImports />
             <importOrder>
               <order>\#,java|javax,,org.apache.tika</order>
             </importOrder>
@@ -1772,7 +1771,7 @@
     </profile>
 
   </profiles>
-  <scm>
+  <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <tag>3.0.0-rc1</tag>
     <connection>scm:git:https://github.com/apache/tika.git</connection>
     <developerConnection>scm:git:https://github.com/apache/tika.git</developerConnection>

tika-parsers/tika-http-jdk/pom.xml

@@ -17,9 +17,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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>

tika-parsers/tika-parsers-ml/tika-inference/pom.xml

@@ -17,9 +17,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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>

tika-parsers/tika-parsers-ml/tika-parser-tess4j-module/pom.xml

@@ -17,9 +17,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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>

tika-parsers/tika-parsers-ml/tika-vlm/pom.xml

@@ -17,9 +17,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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>