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/03/11 15:20:04 UTC
[tika] branch branch_1x updated: TIKA-3068 -- fix release
configuration for tika-server's new bin/service mode
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_1x by this push:
new b55a8d9 TIKA-3068 -- fix release configuration for tika-server's new bin/service mode
b55a8d9 is described below
commit b55a8d94dc3a0cf6925d6765c94954156aad31a8
Author: tallison <ta...@apache.org>
AuthorDate: Wed Mar 11 11:19:42 2020 -0400
TIKA-3068 -- fix release configuration for tika-server's new bin/service mode
---
pom.xml | 2 ++
tika-parent/pom.xml | 20 ++++++++++++--------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0519f7f..71ce449 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,8 @@
<include name="target/*-src.zip*" />
<include name="tika-app/target/tika-app-${project.version}.jar*" />
<include name="tika-server/target/tika-server-${project.version}.jar*" />
+ <include name="tika-server/target/tika-server-${project.version}.bin.tgz*" />
+ <include name="tika-server/target/tika-server-${project.version}.bin.zip*" />
<include name="tika-eval/target/tika-eval-${project.version}.jar*" />
</fileset>
</copy>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index b0f5a33..5a6b26b 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -401,14 +401,7 @@
</excludeCoordinates>
</configuration>
-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.version}</version>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </plugin>
+
<plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
@@ -454,6 +447,17 @@
<artifactId>maven-shade-plugin</artifactId>
<version>${maven.shade.version}</version>
</plugin>
+ <!-- assembly must happen after shade so that
+ tika-server's -bin.tgz/zip includes the uber jar
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.version}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>