You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/08/11 15:24:15 UTC
[tika] 01/03: TIKA-3510 -- separate out modules/packages for
tika-parsers-extended
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 509748b336a2ddc368a237d026fefeee57300325
Author: tallison <ta...@apache.org>
AuthorDate: Wed Aug 11 10:28:41 2021 -0400
TIKA-3510 -- separate out modules/packages for tika-parsers-extended
---
CHANGES.txt | 6 ++
pom.xml | 4 +-
tika-parsers/tika-parsers-extended/pom.xml | 2 +
.../tika-parser-scientific-module/pom.xml | 67 +---------------------
.../pom.xml | 23 ++++----
.../tika-parser-sqlite3-module/pom.xml | 65 +--------------------
.../pom.xml | 11 +---
7 files changed, 28 insertions(+), 150 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 041e27f..5e15625 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,11 @@
Release 2.0.1 - ???
+ MAJOR CHANGES in 2.0.1
+ * Improved packaging for tika-parsers-extended. Use the tika-parser-scientific-package and
+ tika-parser-sqlite3-package artifacts if you want fat jars with dependencies. (TIKA-3510)
+
+
+ Other changes:
* Fix markup ordering errors in xhtml output for ODT files (TIKA-2242).
* Fix serialization of embedded docs in OpenSearch emitter
diff --git a/pom.xml b/pom.xml
index 89486c3..244c27d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,8 +101,8 @@
<fileset dir="${basedir}">
<include name="CHANGES.txt" />
<include name="target/*-src.zip*" />
- <include name="tika-parsers/tika-parsers-extended/tika-parser-scientific-module/target/tika-parser-scientific-module-${project.version}.jar*" />
- <include name="tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/target/tika-parser-sqlite3-module-${project.version}.jar*" />
+ <include name="tika-parsers/tika-parsers-extended/tika-parser-scientific-package/target/tika-parser-scientific-package-${project.version}.jar*" />
+ <include name="tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/target/tika-parser-sqlite3-package-${project.version}.jar*" />
<include name="tika-app/target/tika-app-${project.version}.jar*" />
<include name="tika-server/tika-server-standard/target/tika-server-standard-${project.version}.jar*" />
<include name="tika-server/tika-server-standard/target/tika-server-standard-${project.version}-bin.tgz*" />
diff --git a/tika-parsers/tika-parsers-extended/pom.xml b/tika-parsers/tika-parsers-extended/pom.xml
index 0b373e0..c4c93c1 100644
--- a/tika-parsers/tika-parsers-extended/pom.xml
+++ b/tika-parsers/tika-parsers-extended/pom.xml
@@ -33,6 +33,8 @@
<modules>
<module>tika-parser-sqlite3-module</module>
<module>tika-parser-scientific-module</module>
+ <module>tika-parser-sqlite3-package</module>
+ <module>tika-parser-scientific-package</module>
<module>tika-parsers-extended-integration-tests</module>
</modules>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
index 4675664..1337a22 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
@@ -27,10 +27,7 @@
<artifactId>tika-parser-scientific-module</artifactId>
<name>Apache Tika scientific parser module</name>
-
- <properties>
-
- </properties>
+ <packaging>pom</packaging>
<dependencies>
<!-- needed by AutoDetectReader in EnviHeaderParser -->
@@ -208,68 +205,6 @@ May the gods of dependency management fix this in the future.
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>org.apache.tika.parser.scientific</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${maven.shade.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>
- false
- </createDependencyReducedPom>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>module-info.class</exclude>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- <exclude>META-INF/DEPENDENCIES</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
- <exclude>META-INF/LICENSE.md</exclude>
- <exclude>META-INF/NOTICE.md</exclude>
- </excludes>
- </filter>
- </filters>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
- <addHeader>false</addHeader>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
-
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/LICENSE</resource>
- <file>target/classes/META-INF/LICENSE</file>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>${rat.version}</version>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-scientific-package/pom.xml
similarity index 88%
copy from tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
copy to tika-parsers/tika-parsers-extended/tika-parser-scientific-package/pom.xml
index 7d647bc..fff75d7 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-package/pom.xml
@@ -25,22 +25,21 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tika-parser-sqlite3-module</artifactId>
- <name>Apache Tika sqlite3 parser module</name>
+ <artifactId>tika-parser-scientific-package</artifactId>
+ <name>Apache Tika scientific parser package</name>
+ <properties>
+
+ </properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-jdbc-commons</artifactId>
+ <artifactId>tika-parser-scientific-module</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>${sqlite.version}</version>
- </dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -49,7 +48,7 @@
<configuration>
<archive>
<manifestEntries>
- <Automatic-Module-Name>org.apache.tika.parser.sqlite3</Automatic-Module-Name>
+ <Automatic-Module-Name>org.apache.tika.parser.scientific</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
@@ -78,11 +77,14 @@
<filter>
<artifact>*:*</artifact>
<excludes>
+ <exclude>module-info.class</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/DEPENDENCIES</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/LICENSE.md</exclude>
+ <exclude>META-INF/NOTICE.md</exclude>
</excludes>
</filter>
</filters>
@@ -103,5 +105,6 @@
</executions>
</plugin>
</plugins>
+
</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
index 7d647bc..86c26cf 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
@@ -27,7 +27,7 @@
<artifactId>tika-parser-sqlite3-module</artifactId>
<name>Apache Tika sqlite3 parser module</name>
-
+ <packaging>pom</packaging>
<dependencies>
<dependency>
@@ -41,67 +41,4 @@
<version>${sqlite.version}</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>org.apache.tika.parser.sqlite3</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${maven.shade.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>
- false
- </createDependencyReducedPom>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- <exclude>META-INF/DEPENDENCIES</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
- </excludes>
- </filter>
- </filters>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
- <addHeader>false</addHeader>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
-
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/LICENSE</resource>
- <file>target/classes/META-INF/LICENSE</file>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/pom.xml
similarity index 92%
copy from tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
copy to tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/pom.xml
index 7d647bc..84b5093 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/pom.xml
@@ -25,21 +25,16 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tika-parser-sqlite3-module</artifactId>
- <name>Apache Tika sqlite3 parser module</name>
+ <artifactId>tika-parser-sqlite3-package</artifactId>
+ <name>Apache Tika sqlite3 parser package</name>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-jdbc-commons</artifactId>
+ <artifactId>tika-parser-sqlite3-module</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>${sqlite.version}</version>
- </dependency>
</dependencies>
<build>
<plugins>