Skip to content

Commit d5918e6

Browse files
authored
TIKA-4598: Move tika-pipes-ignite from plugin to standalone module (#2499)
* 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-4598: Update tika-grpc dependency references from tika-pipes-ignite to tika-pipes-config-store-ignite - Updated artifact ID in three locations - Removed ZIP artifact copy (no longer a plugin, doesn't produce ZIP)
1 parent 88e4350 commit d5918e6

File tree

14 files changed

+7
-194
lines changed

14 files changed

+7
-194
lines changed

tika-grpc/pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
</dependency>
233233
<dependency>
234234
<groupId>org.apache.tika</groupId>
235-
<artifactId>tika-pipes-ignite</artifactId>
235+
<artifactId>tika-pipes-config-store-ignite</artifactId>
236236
<version>${project.version}</version>
237237
</dependency>
238238
<dependency>
@@ -321,13 +321,6 @@
321321
<type>zip</type>
322322
<overWrite>true</overWrite>
323323
</artifactItem>
324-
<artifactItem>
325-
<groupId>org.apache.tika</groupId>
326-
<artifactId>tika-pipes-ignite</artifactId>
327-
<version>${project.version}</version>
328-
<type>zip</type>
329-
<overWrite>true</overWrite>
330-
</artifactItem>
331324
<artifactItem>
332325
<groupId>org.apache.tika</groupId>
333326
<artifactId>tika-pipes-jdbc</artifactId>
@@ -611,7 +604,7 @@
611604
</dependency>
612605
<dependency>
613606
<groupId>org.apache.tika</groupId>
614-
<artifactId>tika-pipes-ignite</artifactId>
607+
<artifactId>tika-pipes-config-store-ignite</artifactId>
615608
<version>${project.version}</version>
616609
</dependency>
617610
<dependency>

tika-pipes/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<module>tika-pipes-reporter-commons</module>
3737
<module>tika-pipes-iterator-commons</module>
3838
<module>tika-pipes-plugins</module>
39+
<module>tika-pipes-config-store-ignite</module>
3940
<module>tika-pipes-fork-parser</module>
4041
<module>tika-async-cli</module>
4142
<module>tika-pipes-integration-tests</module>

tika-pipes/tika-pipes-plugins/tika-pipes-ignite/README.md renamed to tika-pipes/tika-pipes-config-store-ignite/README.md

File renamed without changes.

tika-pipes/tika-pipes-plugins/tika-pipes-ignite/pom.xml renamed to tika-pipes/tika-pipes-config-store-ignite/pom.xml

Lines changed: 4 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,20 @@
1919
-->
2020
<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">
2121
<parent>
22-
<artifactId>tika-pipes-plugins</artifactId>
22+
<artifactId>tika-pipes</artifactId>
2323
<groupId>org.apache.tika</groupId>
2424
<version>4.0.0-SNAPSHOT</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

28-
<artifactId>tika-pipes-ignite</artifactId>
29-
<name>Apache Tika Pipes Apache Ignite</name>
28+
<artifactId>tika-pipes-config-store-ignite</artifactId>
29+
<name>Apache Tika Pipes Config Store Ignite</name>
3030
<packaging>jar</packaging>
3131

3232
<properties>
3333
<ignite.version>2.17.0</ignite.version>
3434
<!-- Ignite 2.16.0 requires H2 1.4.x - not compatible with 2.x -->
3535
<h2.version>1.4.197</h2.version>
36-
<plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-pipes-core,tika-serialization,tika-plugins-core</plugin.excluded.artifactIds>
37-
<plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
3836
</properties>
3937

4038
<dependencies>
@@ -47,18 +45,15 @@
4745
<groupId>${project.groupId}</groupId>
4846
<artifactId>tika-pipes-api</artifactId>
4947
<version>${project.version}</version>
50-
<scope>provided</scope>
5148
</dependency>
5249
<dependency>
5350
<groupId>${project.groupId}</groupId>
5451
<artifactId>tika-core</artifactId>
5552
<version>${project.version}</version>
56-
<scope>provided</scope>
5753
</dependency>
5854
<dependency>
5955
<groupId>org.apache.logging.log4j</groupId>
6056
<artifactId>log4j-slf4j2-impl</artifactId>
61-
<scope>provided</scope>
6257
</dependency>
6358
<dependency>
6459
<groupId>org.apache.ignite</groupId>
@@ -116,54 +111,7 @@
116111
</archive>
117112
</configuration>
118113
</plugin>
119-
<plugin>
120-
<groupId>org.apache.maven.plugins</groupId>
121-
<artifactId>maven-dependency-plugin</artifactId>
122-
<executions>
123-
<execution>
124-
<id>copy-dependencies</id>
125-
<phase>package</phase>
126-
<goals>
127-
<goal>copy-dependencies</goal>
128-
</goals>
129-
<configuration>
130-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
131-
<includeScope>runtime</includeScope>
132-
<excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
133-
<excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
134-
</configuration>
135-
</execution>
136-
</executions>
137-
</plugin>
138-
<plugin>
139-
<groupId>org.apache.maven.plugins</groupId>
140-
<artifactId>maven-assembly-plugin</artifactId>
141-
<configuration>
142-
<descriptors>
143-
<descriptor>src/main/assembly/assembly.xml</descriptor>
144-
</descriptors>
145-
<finalName>${project.artifactId}-${project.version}</finalName>
146-
<appendAssemblyId>false</appendAssemblyId>
147-
</configuration>
148-
<executions>
149-
<execution>
150-
<id>make-assembly</id>
151-
<phase>package</phase>
152-
<goals>
153-
<goal>single</goal>
154-
</goals>
155-
</execution>
156-
</executions>
157-
</plugin>
158-
<plugin>
159-
<groupId>org.apache.maven.plugins</groupId>
160-
<artifactId>maven-compiler-plugin</artifactId>
161-
<configuration>
162-
<annotationProcessors>
163-
<annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
164-
</annotationProcessors>
165-
</configuration>
166-
</plugin>
114+
167115
<plugin>
168116
<groupId>org.apache.maven.plugins</groupId>
169117
<artifactId>maven-surefire-plugin</artifactId>

tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/ExtensionConfigDTO.java renamed to tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/ExtensionConfigDTO.java

File renamed without changes.

tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStore.java renamed to tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStore.java

File renamed without changes.

tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStoreFactory.java renamed to tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/IgniteConfigStoreFactory.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import java.io.IOException;
2020

21-
import org.pf4j.Extension;
22-
2321
import org.apache.tika.exception.TikaConfigException;
2422
import org.apache.tika.pipes.core.config.ConfigStore;
2523
import org.apache.tika.pipes.core.config.ConfigStoreFactory;
@@ -28,7 +26,6 @@
2826
/**
2927
* Factory for creating Ignite-based ConfigStore instances.
3028
*/
31-
@Extension
3229
public class IgniteConfigStoreFactory implements ConfigStoreFactory {
3330

3431
private static final String NAME = "ignite";

tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/config/IgniteConfigStoreConfig.java renamed to tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/config/IgniteConfigStoreConfig.java

File renamed without changes.

tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/main/java/org/apache/tika/pipes/ignite/server/IgniteStoreServer.java renamed to tika-pipes/tika-pipes-config-store-ignite/src/main/java/org/apache/tika/pipes/ignite/server/IgniteStoreServer.java

File renamed without changes.

tika-pipes/tika-pipes-plugins/tika-pipes-ignite/src/test/java/org/apache/tika/pipes/ignite/IgniteConfigStoreTest.java renamed to tika-pipes/tika-pipes-config-store-ignite/src/test/java/org/apache/tika/pipes/ignite/IgniteConfigStoreTest.java

File renamed without changes.

0 commit comments

Comments
 (0)