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 2020/09/08 19:12:50 UTC
[tika] 02/03: Merge branch 'task/add-bundle-packaging-to-modules'
of https://github.com/bobpaulin/tika into
bobpaulin-task/add-bundle-packagingto-modules
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 469e543175c7d1db1a018a5c62acdc396bbc4948
Merge: 46e17b4 fc3736a
Author: tallison <ta...@apache.org>
AuthorDate: Tue Sep 8 15:10:11 2020 -0400
Merge branch 'task/add-bundle-packaging-to-modules' of https://github.com/bobpaulin/tika into bobpaulin-task/add-bundle-packagingto-modules
# Conflicts:
# tika-advanced-parser-modules/pom.xml
tika-parser-modules/pom.xml | 34 +++++++++++++++++++++++++-
tika-parsers-advanced/pom.xml | 57 ++++++++++++++++++++++++++++++++++---------
tika-parsers-extended/pom.xml | 48 +++++++++++++++++++++++++++---------
3 files changed, 114 insertions(+), 25 deletions(-)
diff --cc tika-parser-modules/pom.xml
index b4ac98f,ec83855..5c660f9
--- a/tika-parser-modules/pom.xml
+++ b/tika-parser-modules/pom.xml
@@@ -78,22 -90,48 +78,54 @@@
<module>tika-parser-mail-module</module>
<module>tika-parser-miscoffice-module</module>
<module>tika-parser-news-module</module>
- <module>tika-parser-db-module</module>
<module>tika-parser-crypto-module</module>
- <module>tika-parser-scientific-module</module>
<module>tika-parser-integration-tests</module>
</modules>
-
-
<build>
+ <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- <Import-Package>
- org.apache.tika.*,
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/test-documents/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-jar-plugin</artifactId>
++ <configuration>
++ <archive>
++ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
++ </archive>
++ </configuration>
++ </plugin>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <configuration>
++ <instructions>
++ <Bundle-DocURL>${project.url}</Bundle-DocURL>
++ <Import-Package>
++ org.apache.tika.*,
++ *;resolution:=optional
++ </Import-Package>
++ </instructions>
++ </configuration>
++ <executions>
++ <execution>
++ <id>bundle-manifest</id>
++ <phase>process-classes</phase>
++ <goals>
++ <goal>manifest</goal>
++ </goals>
++ </execution>
++ </executions>
++ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
-
</project>
diff --cc tika-parsers-advanced/pom.xml
index d9320fc,65c51e0..44f24fb
--- a/tika-parsers-advanced/pom.xml
+++ b/tika-parsers-advanced/pom.xml
@@@ -40,19 -20,42 +40,52 @@@
<module>tika-parser-advancedmedia-module</module>
<module>tika-dl</module>
</modules>
-
+
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
- <configuration>
- <excludes>
- <exclude>src/test/resources/test-documents/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
++ <groupId>org.apache.rat</groupId>
++ <artifactId>apache-rat-plugin</artifactId>
++ <version>${rat.version}</version>
++ <configuration>
++ <excludes>
++ <exclude>src/test/resources/test-documents/**</exclude>
++ </excludes>
++ </configuration>
++ </plugin>
++ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
++ <configuration>
+ <instructions>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ <Import-Package>
+ org.apache.tika.*,
+ *;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
diff --cc tika-parsers-extended/pom.xml
index 61410c0,ec83855..9c55507
--- a/tika-parsers-extended/pom.xml
+++ b/tika-parsers-extended/pom.xml
@@@ -52,23 -69,69 +52,47 @@@
</dependency>
</dependencies>
<modules>
- <module>tika-parser-digest-commons</module>
- <module>tika-parser-mail-commons</module>
- <module>tika-parser-xmp-commons</module>
- <module>tika-parser-zip-commons</module>
-
- <module>tika-parser-ocr-module</module>
- <module>tika-parser-audiovideo-module</module>
- <module>tika-parser-code-module</module>
- <module>tika-parser-html-module</module>
- <module>tika-parser-image-module</module>
- <module>tika-parser-text-module</module>
- <module>tika-parser-font-module</module>
- <module>tika-parser-microsoft-module</module>
- <module>tika-parser-pkg-module</module>
- <module>tika-parser-xml-module</module>
- <module>tika-parser-pdf-module</module>
- <module>tika-parser-apple-module</module>
- <module>tika-parser-cad-module</module>
- <module>tika-parser-mail-module</module>
- <module>tika-parser-miscoffice-module</module>
- <module>tika-parser-news-module</module>
- <module>tika-parser-db-module</module>
- <module>tika-parser-crypto-module</module>
+ <module>tika-parser-sqlite3-module</module>
<module>tika-parser-scientific-module</module>
- <module>tika-parser-integration-tests</module>
+ <module>tika-parsers-extended-integration-tests</module>
</modules>
-
+
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
- <configuration>
- <excludes>
- <exclude>src/test/resources/test-documents/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
++ <groupId>org.apache.rat</groupId>
++ <artifactId>apache-rat-plugin</artifactId>
++ <version>${rat.version}</version>
+ <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
++ <excludes>
++ <exclude>src/test/resources/test-documents/**</exclude>
++ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ <Import-Package>
+ org.apache.tika.*,
+ *;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
-
</project>