TIKA-4334 - move tika-pipes out of core (#2339)

Author: tballison

CHANGES.txt

@@ -1,6 +1,9 @@
 Release 4.0.0-BETA1 - ???
   BREAKING CHANGES
 
+   * tika-pipes core classes have been moved to a new module: tika-pipes-core,
+     and the FileSystem pipes components have moved (TIKA-4334).
+
    * Headers are no longer injected into the body/content of MSG files (TIKA-4345). Please open
      a ticket if you need this behavior across email formats.
 

tika-app/pom.xml

@@ -63,11 +63,6 @@
       <artifactId>tika-xmp</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-emitter-fs</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <!-- this brings in tika-core -->
     <dependency>
       <groupId>${project.groupId}</groupId>

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

@@ -53,7 +53,8 @@ public class TikaCLIAsyncTest {
     public static void setUpClass() throws Exception {
         ASYNC_CONFIG = Files.createTempFile(ASYNC_OUTPUT_DIR, "async-config-", ".xml");
         String xml = "<properties>" + "<async>" + "<numClients>3</numClients>" + "<tikaConfig>" + ASYNC_CONFIG.toAbsolutePath() + "</tikaConfig>" + "</async>" + "<fetchers>" +
-                "<fetcher class=\"org.apache.tika.pipes.fetcher.fs.FileSystemFetcher\">" + "<name>fsf</name>" + "<basePath>" + TEST_DATA_FILE.getAbsolutePath() + "</basePath>" +
+                "<fetcher class=\"org.apache.tika.pipes.fetcher.fs.FileSystemFetcher\">" + "<name>fsf</name>" + "<basePath>" + TEST_DATA_FILE.getAbsolutePath() +
+                "</basePath>" +
                 "</fetcher>" + "</fetchers>" + "<emitters>" + "<emitter class=\"org.apache.tika.pipes.emitter.fs.FileSystemEmitter\">" + "<name>fse</name>" + "<basePath>" +
                 ASYNC_OUTPUT_DIR.toAbsolutePath() + "</basePath>" + "<prettyPrint>true</prettyPrint>" + "</emitter>" + "</emitters>" +
                 "<pipesIterator class=\"org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator\">" + "<basePath>" + TEST_DATA_FILE.getAbsolutePath() + "</basePath>" +

tika-bom/pom.xml

@@ -310,7 +310,7 @@
       <!-- Tika Pipes modules -->
       <dependency>
         <groupId>org.apache.tika</groupId>
-        <artifactId>tika-emitter-fs</artifactId>
+        <artifactId>tika-pipes-core</artifactId>
         <version>4.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>

tika-eval/tika-eval-app/pom.xml

@@ -32,7 +32,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tika</groupId>
-      <artifactId>tika-core</artifactId>
+      <artifactId>tika-pipes-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparer.java

@@ -43,7 +43,7 @@
 import org.apache.tika.eval.core.util.ContentTags;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.metadata.TikaCoreProperties;
-import org.apache.tika.pipes.fetcher.FetchKey;
+import org.apache.tika.pipes.core.fetcher.FetchKey;
 
 public class ExtractComparer extends ProfilerBase {
 

tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparerRunner.java

@@ -55,9 +55,9 @@
 import org.apache.tika.eval.app.io.ExtractReader;
 import org.apache.tika.eval.app.io.ExtractReaderException;
 import org.apache.tika.eval.app.io.IDBWriter;
-import org.apache.tika.pipes.FetchEmitTuple;
-import org.apache.tika.pipes.pipesiterator.CallablePipesIterator;
-import org.apache.tika.pipes.pipesiterator.PipesIterator;
+import org.apache.tika.pipes.core.FetchEmitTuple;
+import org.apache.tika.pipes.core.pipesiterator.CallablePipesIterator;
+import org.apache.tika.pipes.core.pipesiterator.PipesIterator;
 import org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator;
 
 public class ExtractComparerRunner {

tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfileRunner.java

@@ -55,9 +55,9 @@
 import org.apache.tika.eval.app.io.ExtractReader;
 import org.apache.tika.eval.app.io.ExtractReaderException;
 import org.apache.tika.eval.app.io.IDBWriter;
-import org.apache.tika.pipes.FetchEmitTuple;
-import org.apache.tika.pipes.pipesiterator.CallablePipesIterator;
-import org.apache.tika.pipes.pipesiterator.PipesIterator;
+import org.apache.tika.pipes.core.FetchEmitTuple;
+import org.apache.tika.pipes.core.pipesiterator.CallablePipesIterator;
+import org.apache.tika.pipes.core.pipesiterator.PipesIterator;
 import org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator;
 
 public class ExtractProfileRunner {

tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfiler.java

@@ -34,7 +34,7 @@
 import org.apache.tika.eval.core.util.ContentTags;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.metadata.TikaCoreProperties;
-import org.apache.tika.pipes.fetcher.FetchKey;
+import org.apache.tika.pipes.core.fetcher.FetchKey;
 
 public class ExtractProfiler extends ProfilerBase {
 

tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ProfilerBase.java

@@ -71,7 +71,7 @@
 import org.apache.tika.metadata.PagedText;
 import org.apache.tika.metadata.Property;
 import org.apache.tika.metadata.TikaCoreProperties;
-import org.apache.tika.pipes.fetcher.FetchKey;
+import org.apache.tika.pipes.core.fetcher.FetchKey;
 import org.apache.tika.sax.ToXMLContentHandler;
 import org.apache.tika.utils.StringUtils;