TIKA-3068 -- fix release configuration for tika-server's new bin/serv…

…ice mode
apache · Mar 11, 2020 · b55a8d9 · b55a8d9
1 parent abf4bd5
commit b55a8d9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -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>