This is an automated email from the ASF dual-hosted git repository. ndipiazza pushed a commit to branch TIKA-4598 in repository https://gitbox.apache.org/repos/asf/tika.git
commit fe2ef57ace39b5b6d3133bbee9007286b0f37265 Author: Nicholas DiPiazza <[email protected]> AuthorDate: Mon Dec 29 03:30:40 2025 -0600 TIKA-4598: Move tika-pipes-ignite from plugin to standalone module - Relocated from tika-pipes/tika-pipes-plugins/tika-pipes-ignite to tika-pipes/tika-pipes-config-store-ignite - Changed parent from tika-pipes-plugins to tika-pipes - Removed plugin.properties and IgnitePipesPlugin class - Updated module name from tika-pipes-ignite to tika-pipes-config-store-ignite - Module is now directly under tika-pipes alongside other config stores - All tests passing --- tika-pipes/pom.xml | 1 + .../README.md | 0 .../pom.xml | 60 ++-------------------- .../tika/pipes/ignite/ExtensionConfigDTO.java | 0 .../tika/pipes/ignite/IgniteConfigStore.java | 0 .../pipes/ignite/IgniteConfigStoreFactory.java | 3 -- .../ignite/config/IgniteConfigStoreConfig.java | 0 .../pipes/ignite/server/IgniteStoreServer.java | 0 .../tika/pipes/ignite/IgniteConfigStoreTest.java | 0 tika-pipes/tika-pipes-plugins/pom.xml | 1 - .../src/main/assembly/assembly.xml | 55 -------------------- .../pipes/plugin/ignite/IgnitePipesPlugin.java | 48 ----------------- .../src/main/resources/plugin.properties | 22 -------- 13 files changed, 5 insertions(+), 185 deletions(-) diff --git a/tika-pipes/pom.xml b/tika-pipes/pom.xml index e8366313d..36f77c8d1 100644 --- a/tika-pipes/pom.xml +++ b/tika-pipes/pom.xml @@ -36,6 +36,7 @@ <module>tika-pipes-reporter-commons</module> <module>tika-pipes-iterator-commons</module> <module>tika-pipes-plugins</module> + <module>tika-pipes-config-store-ignite</module> <module>tika-pipes-fork-parser</module> <module>tika-async-cli</module> <module>tika-pipes-integration-tests</module> diff --git a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/README.md b/tika-pipes/tika-pipes-config-store-ignite/README.md similarity index 100% rename from tika-pipes/tika-pipes-plugins/tika-pipes-ignite/README.md rename to tika-pipes/tika-pipes-config-store-ignite/README.md diff --git a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/pom.xml b/tika-pipes/tika-pipes-config-store-ignite/pom.xml similarity index 66% rename from tika-pipes/tika-pipes-plugins/tika-pipes-ignite/pom.xml rename to tika-pipes/tika-pipes-config-store-ignite/pom.xml index eb52ff0e9..46d3191ef 100644 --- a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/pom.xml +++ b/tika-pipes/tika-pipes-config-store-ignite/pom.xml @@ -19,22 +19,20 @@ --> <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"> <parent> - <artifactId>tika-pipes-plugins</artifactId> + <artifactId>tika-pipes</artifactId> <groupId>org.apache.tika</groupId> <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>tika-pipes-ignite</artifactId> - <name>Apache Tika Pipes Apache Ignite</name> + <artifactId>tika-pipes-config-store-ignite</artifactId> + <name>Apache Tika Pipes Config Store Ignite</name> <packaging>jar</packaging> <properties> <ignite.version>2.17.0</ignite.version> <!-- Ignite 2.16.0 requires H2 1.4.x - not compatible with 2.x --> <h2.version>1.4.197</h2.version> - <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-pipes-core,tika-serialization,tika-plugins-core</plugin.excluded.artifactIds> - <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds> </properties> <dependencies> @@ -47,18 +45,15 @@ <groupId>${project.groupId}</groupId> <artifactId>tika-pipes-api</artifactId> <version>${project.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>tika-core</artifactId> <version>${project.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.ignite</groupId> @@ -116,54 +111,7 @@ </archive> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - <includeScope>runtime</includeScope> - <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds> - <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - <finalName>${project.artifactId}-${project.version}</finalName> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessors> - <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor> - </annotationProcessors> - </configuration> - </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/ExtensionConfigDTO.java b/tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/ExtensionConfigDTO.java similarity index 100% rename from tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/ExtensionConfigDTO.java rename to tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/ExtensionConfigDTO.java diff --git a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStore.java b/tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStore.java similarity index 100% rename from tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStore.java rename to tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStore.java diff --git a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStoreFactory.java b/tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStoreFactory.java similarity index 97% rename from tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStoreFactory.java rename to tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStoreFactory.java index c527b5c67..81c40b79b 100644 --- a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStoreFactory.java +++ b/tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStoreFactory.java @@ -18,8 +18,6 @@ package org.apache.tika.pipes.ignite; import java.io.IOException; -import org.pf4j.Extension; - import org.apache.tika.exception.TikaConfigException; import org.apache.tika.pipes.core.config.ConfigStore; import org.apache.tika.pipes.core.config.ConfigStoreFactory; @@ -28,7 +26,6 @@ import org.apache.tika.plugins.ExtensionConfig; /** * Factory for creating Ignite-based ConfigStore instances. */ -@Extension public class IgniteConfigStoreFactory implements ConfigStoreFactory { private static final String NAME = "ignite"; diff --git a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/config/IgniteConfigStoreConfig.java b/tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/config/IgniteConfigStoreConfig.java similarity index 100% rename from tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/config/IgniteConfigStoreConfig.java rename to tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/config/IgniteConfigStoreConfig.java diff --git a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/server/IgniteStoreServer.java b/tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/server/IgniteStoreServer.java similarity index 100% rename from tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/server/IgniteStoreServer.java rename to tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/server/IgniteStoreServer.java diff --git a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/test/java/org/apache/tika/pipes/ignite/IgniteConfigStoreTest.java b/tika-pipes/tika-pipes-config-store-ignite/src/test/java/org/apache/tika/pipes/ignite/IgniteConfigStoreTest.java similarity index 100% rename from tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/test/java/org/apache/tika/pipes/ignite/IgniteConfigStoreTest.java rename to tika-pipes/tika-pipes-config-store-ignite/src/test/java/org/apache/tika/pipes/ignite/IgniteConfigStoreTest.java diff --git a/tika-pipes/tika-pipes-plugins/pom.xml b/tika-pipes/tika-pipes-plugins/pom.xml index d33378351..abc9314f6 100644 --- a/tika-pipes/tika-pipes-plugins/pom.xml +++ b/tika-pipes/tika-pipes-plugins/pom.xml @@ -37,7 +37,6 @@ <module>tika-pipes-file-system</module> <module>tika-pipes-gcs</module> <module>tika-pipes-http</module> - <module>tika-pipes-ignite</module> <module>tika-pipes-jdbc</module> <module>tika-pipes-json</module> <module>tika-pipes-kafka</module> diff --git a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/assembly/assembly.xml deleted file mode 100644 index ea0f8b4a1..000000000 --- a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/assembly/assembly.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 - http://maven.apache.org/xsd/assembly-2.0.0.xsd"> - <id>dependencies-zip</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>${project.build.directory}/lib</directory> - <outputDirectory>/lib</outputDirectory> - </fileSet> - <fileSet> - <directory>${project.build.directory}</directory> - <outputDirectory>/lib</outputDirectory> - <includes> - <include>${project.artifactId}-${project.version}.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.build.directory}</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>classes/META-INF/extensions.idx</include> - <include>classes/META-INF/MANIFEST.MF</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/resources</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>plugin.properties</include> - </includes> - </fileSet> - </fileSets> -</assembly> diff --git a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/plugin/ignite/IgnitePipesPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/plugin/ignite/IgnitePipesPlugin.java deleted file mode 100644 index 07b2f68d0..000000000 --- a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/plugin/ignite/IgnitePipesPlugin.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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. - */ -package org.apache.tika.pipes.plugin.ignite; - -import org.pf4j.Plugin; -import org.pf4j.PluginWrapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class IgnitePipesPlugin extends Plugin { - private static final Logger LOG = LoggerFactory.getLogger(IgnitePipesPlugin.class); - - public IgnitePipesPlugin(PluginWrapper wrapper) { - super(wrapper); - } - - @Override - public void start() { - LOG.info("Starting Ignite Config Store Plugin"); - super.start(); - } - - @Override - public void stop() { - LOG.info("Stopping Ignite Config Store Plugin"); - super.stop(); - } - - @Override - public void delete() { - LOG.info("Deleting Ignite Config Store Plugin"); - super.delete(); - } -} diff --git a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/resources/plugin.properties deleted file mode 100644 index da2660f1a..000000000 --- a/tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/resources/plugin.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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. - -plugin.id=tika-pipes-ignite-plugin -plugin.class=org.apache.tika.pipes.plugin.ignite.IgnitePipesPlugin -plugin.version=4.0.0-SNAPSHOT -plugin.provider=Apache Tika -plugin.description=Pipes for Apache Ignite Config Store -
