TIKA-4808 - revert aborted 4.0.0-rc1 release commits; fix per-module javadoc jars

Author: tballison

tika-metadata-schema/pom.xml

@@ -15,7 +15,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 http://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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.tika</groupId>
@@ -111,7 +113,7 @@
                   <classpathScope>test</classpathScope>
                   <arguments>
                     <argument>-cp</argument>
-                    <classpath />
+                    <classpath/>
                     <argument>org.apache.tika.metadata.schema.SchemaGenerator</argument>
                     <argument>${project.basedir}/src/main/resources/org/apache/tika/metadata/metadata-keys.json</argument>
                     <argument>${project.basedir}/src/main/resources/org/apache/tika/metadata/metadata-open-namespaces.json</argument>

tika-parent/pom.xml

@@ -281,14 +281,14 @@
   </contributors>
 
   <properties>
-    <revision>4.0.1-SNAPSHOT</revision>
+    <revision>4.0.0-SNAPSHOT</revision>
     <javaVersion>17</javaVersion>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
     <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-08-18T16:33:03Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2026-06-29T15:00:41Z</project.build.outputTimestamp>
     <!-- plugin versions -->
     <!-- updates may not be detected by the maven versions plugin:
          https://github.com/mojohaus/versions/issues/1070 -->
@@ -1727,6 +1727,17 @@
               <sourcepath>tika-annotation-processor/src/main/java;tika-app/src/main/java;tika-bundles/tika-bundle-standard/src/main/java;tika-core/src/main/java;tika-detectors/tika-detector-magika/src/main/java;tika-detectors/tika-detector-siegfried/src/main/java;tika-encoding-detectors/tika-encoding-detector-html/src/main/java;tika-encoding-detectors/tika-encoding-detector-icu4j/src/main/java;tika-encoding-detectors/tika-encoding-detector-mojibuster/src/main/java;tika-encoding-detectors/tika-encoding-detector-universal/src/main/java;tika-eval/tika-eval-app/src/main/java;tika-eval/tika-eval-core/src/main/java;tika-example/src/main/java;tika-handlers/tika-handler-boilerpipe/src/main/java;tika-java7/src/main/java;tika-langdetect/tika-langdetect-charsoup-core/src/main/java;tika-langdetect/tika-langdetect-charsoup/src/main/java;tika-langdetect/tika-langdetect-lingo24/src/main/java;tika-langdetect/tika-langdetect-mitll-text/src/main/java;tika-langdetect/tika-langdetect-opennlp/src/main/java;tika-langdetect/tika-langdetect-optimaize/src/main/java;tika-langdetect/tika-langdetect-test-commons/src/main/java;tika-metadata-schema/src/main/java;tika-ml/tika-ml-chardetect/src/main/java;tika-ml/tika-ml-core/src/main/java;tika-ml/tika-ml-junkdetect-tools/src/main/java;tika-ml/tika-ml-junkdetect/src/main/java;tika-parsers/tika-http-jdk/src/main/java;tika-parsers/tika-parsers-extended/tika-parser-ocr-encode-module/src/main/java;tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java;tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/src/main/java;tika-parsers/tika-parsers-ml/tika-inference/src/main/java;tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java;tika-parsers/tika-parsers-ml/tika-parser-tess4j-module/src/main/java;tika-parsers/tika-parsers-ml/tika-transcribe-aws/src/main/java;tika-parsers/tika-parsers-ml/tika-vlm/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-datauri-commons/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-jdbc-commons/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-commons/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java;tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java;tika-pipes/tika-async-cli/src/main/java;tika-pipes/tika-httpclient-commons/src/main/java;tika-pipes/tika-pipes-api/src/main/java;tika-pipes/tika-pipes-config-store-ignite/src/main/java;tika-pipes/tika-pipes-core/src/main/java;tika-pipes/tika-pipes-fork-parser/src/main/java;tika-pipes/tika-pipes-iterator-commons/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-atlassian-jwt/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-es/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-google-drive/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java;tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java;tika-pipes/tika-pipes-reporter-commons/src/main/java;tika-plugins-core/src/main/java;tika-serialization/src/main/java;tika-server/tika-server-core/src/main/java;tika-server/tika-server-standard/src/main/java;tika-translate/src/main/java;tika-xmp/src/main/java</sourcepath>
               <subpackages>org.apache.tika</subpackages>
             </configuration>
+            <executions>
+              <!-- The aggregate sourcepath above is root-relative, so it resolves to nothing in a
+                   per-module javadoc:jar. Override it for the apache-release parent's
+                   attach-javadocs execution, which documents one module from its own basedir. -->
+              <execution>
+                <id>attach-javadocs</id>
+                <configuration>
+                  <sourcepath>src/main/java</sourcepath>
+                </configuration>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>