This is an automated email from the ASF dual-hosted git repository.
ndipiazza pushed a commit to branch TIKA-4272-docker
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 558c11966f3f386c3bcfcabd9ef9372bed106086
Author: Nicholas DiPiazza <ndipia...@apache.org>
AuthorDate: Sun Aug 18 10:36:44 2024 -0500
TIKA-4272: use the maven dependency plugin and maven assembly plugin
---
pom.xml | 1 +
tika-grpc/pom.xml | 98 ++++++++++++--------------------
tika-grpc/src/assembly/grpc-assembly.xml | 23 ++++++++
3 files changed, 60 insertions(+), 62 deletions(-)
diff --git a/pom.xml b/pom.xml
index 552f4ceb5..7a488f2d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,7 @@
<include
name="tika-server/tika-server-standard/target/tika-server-standard-${project.version}-bin.tgz*"
/>
<include
name="tika-server/tika-server-standard/target/tika-server-standard-${project.version}-bin.zip*"
/>
<include
name="tika-eval/tika-eval-app/target/tika-eval-app-${project.version}.jar*" />
+ <include
name="tika-grpc/target/tika-grpc-${project.version}.zip*" />
</fileset>
</copy>
<checksum algorithm="SHA-512" fileext=".sha512">
diff --git a/tika-grpc/pom.xml b/tika-grpc/pom.xml
index 48e0a3920..659995a87 100644
--- a/tika-grpc/pom.xml
+++ b/tika-grpc/pom.xml
@@ -341,68 +341,6 @@
<mainClass>org.apache.tika.pipes.grpc.TikaGrpcServer</mainClass>
</configuration>
</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>
- <artifactSet>
- <excludes>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>module-info.class</exclude>
- <exclude>META-INF/maven/plugin.xml</exclude>
- <exclude>META-INF/versions/9/module-info.class</exclude>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- <exclude>META-INF/*.txt</exclude>
- <exclude>META-INF/ASL2.0</exclude>
- <exclude>META-INF/DEPENDENCIES</exclude>
- <exclude>META-INF/LICENSE</exclude>
- <exclude>META-INF/NOTICE</exclude>
- <exclude>META-INF/README</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>NOTICE.txt</exclude>
- <exclude>CHANGES</exclude>
- <exclude>README</exclude>
- <exclude>builddef.lst</exclude>
- </excludes>
- </filter>
- </filters>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-
<mainClass>org.apache.tika.pipes.grpc.TikaGrpcServer</mainClass>
- <manifestEntries>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- </transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/LICENSE</resource>
- <file>target/classes/META-INF/LICENSE</file>
- </transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/NOTICE</resource>
- <file>target/classes/META-INF/NOTICE</file>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -435,6 +373,42 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.6.1</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/grpc-assembly.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/tika-grpc/src/assembly/grpc-assembly.xml
b/tika-grpc/src/assembly/grpc-assembly.xml
new file mode 100644
index 000000000..ee99848ed
--- /dev/null
+++ b/tika-grpc/src/assembly/grpc-assembly.xml
@@ -0,0 +1,23 @@
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="http://maven.apache.org/ASSEMBLY/2.0.0";
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
+ http://maven.apache.org/xsd/assembly-2.0.0.xsd";>
+ <id>dependencies-zip</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/dependencies</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
