this fixes split packages across the repo in 4.x (#2933)

Author: tballison

.github/scripts/check_split_packages.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+# 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 regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""
+Fail if any Java package is declared in more than one Maven module ("split
+package"). JPMS forbids split packages on the module path, and Tika keeps
+one-package-per-module as an invariant (see TIKA-4xxx). This is a structural,
+reactor-wide check that per-module tools (checkstyle, forbidden-apis, spotless,
+banDuplicateClasses) cannot express.
+
+Scope: main sources only (src/main/java) -- that is what JPMS cares about;
+test sources live in the unnamed module and are intentionally excluded.
+
+Usage:  python3 .github/scripts/check_split_packages.py [repo_root]
+Exit:   0 = no split packages, 1 = split package(s) found.
+"""
+import os
+import sys
+import collections
+
+PRUNE = {"target", ".git", ".local_m2_repo", "node_modules", ".mvn"}
+
+
+def main() -> int:
+    root = os.path.abspath(sys.argv[1] if len(sys.argv) > 1 else ".")
+    pkg_to_modules = collections.defaultdict(set)
+    for dirpath, dirnames, _ in os.walk(root):
+        dirnames[:] = [d for d in dirnames if d not in PRUNE]
+        norm = dirpath.replace(os.sep, "/")
+        if not norm.endswith("/src/main/java"):
+            continue
+        src_root = dirpath
+        module = os.path.relpath(dirpath[: -len(os.sep + "src/main/java")], root).replace(os.sep, "/")
+        for sub, _, files in os.walk(src_root):
+            if any(f.endswith(".java") and f != "package-info.java" for f in files):
+                pkg = os.path.relpath(sub, src_root).replace(os.sep, ".")
+                if pkg and pkg != ".":
+                    pkg_to_modules[pkg].add(module)
+
+    splits = {p: sorted(m) for p, m in pkg_to_modules.items() if len(m) > 1}
+    if not splits:
+        print(f"OK: no split packages ({len(pkg_to_modules)} packages across the reactor).")
+        return 0
+
+    print("ERROR: split package(s) found -- each package must live in exactly one module.\n")
+    for pkg, mods in sorted(splits.items()):
+        print(f"  {pkg}")
+        for m in mods:
+            print(f"      {m}")
+    print("\nJPMS forbids a package spanning modules. Move the minority side into a")
+    print("module-specific package (e.g. org.apache.tika.detect.icu4j) so the package")
+    print("lives in one module only. See the maintainer docs on split packages.")
+    return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())

.github/workflows/split-packages.yml

@@ -0,0 +1,33 @@
+#
+# 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 regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: no split packages
+
+on:
+  pull_request:
+    branches: [ main ]
+  push:
+    branches: [ main ]
+
+jobs:
+  check-split-packages:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@v6
+      - name: Check for split packages (one package = one module, JPMS invariant)
+        run: python3 .github/scripts/check_split_packages.py

docs/modules/ROOT/pages/advanced/language-detection.adoc

@@ -226,7 +226,7 @@ For the default classpath resources (general model ~3.2 MB, short-text model
 == WordTokenizer (tika-eval integration)
 
 The same preprocessing pipeline is exposed as a general-purpose word tokenizer
-via `org.apache.tika.langdetect.charsoup.WordTokenizer`. This replaces the former
+via `org.apache.tika.langdetect.charsoup.core.WordTokenizer`. This replaces the former
 Lucene-based tokenizer in `tika-eval`:
 
 * `tokenize(String)` — alphabetic and ideographic tokens only (CJK bigrams)

docs/modules/ROOT/pages/developers/serialization.adoc

@@ -315,7 +315,7 @@ Complete example of a custom metadata filter:
 ----
 package com.example.tika;
 
-import org.apache.tika.config.TikaComponent;
+import org.apache.tika.annotation.TikaComponent;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.metadata.filter.MetadataFilter;

…rg/apache/tika/config/TikaComponent.java …pache/tika/annotation/TikaComponent.javatika-annotation-processor/src/main/java/org/apache/tika/config/TikaComponent.java renamed to tika-annotation-processor/src/main/java/org/apache/tika/annotation/TikaComponent.java tika-annotation-processor/src/main/java/org/apache/tika/config/TikaComponent.java renamed to tika-annotation-processor/src/main/java/org/apache/tika/annotation/TikaComponent.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.config;
+package org.apache.tika.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

tika-annotation-processor/src/main/java/org/apache/tika/annotation/TikaComponentProcessor.java

@@ -45,7 +45,6 @@
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 
-import org.apache.tika.config.TikaComponent;
 
 /**
  * Annotation processor for {@link TikaComponent} that generates:
@@ -57,7 +56,7 @@
  * <p>The processor maintains an inclusion list of known Tika service interfaces
  * to avoid generating SPI files for utility interfaces like Serializable, etc.
  */
-@SupportedAnnotationTypes("org.apache.tika.config.TikaComponent")
+@SupportedAnnotationTypes("org.apache.tika.annotation.TikaComponent")
 @SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class TikaComponentProcessor extends AbstractProcessor {
 

tika-app/src/test/java/org/apache/tika/cli/TikaCLIAsyncTest.java

@@ -39,7 +39,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.tika.config.JsonConfigHelper;
+import org.apache.tika.serialization.config.JsonConfigHelper;
 
 public class TikaCLIAsyncTest {
 

tika-core/src/main/java/org/apache/tika/config/EmbeddedLimits.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 package org.apache.tika.config;
-
 import java.io.Serializable;
 
+import org.apache.tika.annotation.TikaComponent;
 import org.apache.tika.parser.ParseContext;
 
 /**

tika-core/src/main/java/org/apache/tika/config/OutputLimits.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 package org.apache.tika.config;
-
 import java.io.Serializable;
 
+import org.apache.tika.annotation.TikaComponent;
 import org.apache.tika.parser.ParseContext;
 
 /**

tika-core/src/main/java/org/apache/tika/config/TimeoutLimits.java

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 package org.apache.tika.config;
-
 import java.io.Serializable;
 import java.util.Objects;
 
+import org.apache.tika.annotation.TikaComponent;
 import org.apache.tika.parser.ParseContext;
 
 /**