From 1aec6ef877f146008961d11c6d58973f39b2d864 Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Sat, 29 Jun 2019 15:34:15 +0200
Subject: [PATCH] Include required jar files for secret-service in Linux build

---
 main/buildkit/assembly-linux.xml |  7 +++++++
 main/buildkit/pom.xml            | 12 ++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/main/buildkit/assembly-linux.xml b/main/buildkit/assembly-linux.xml
index 9784212b5..35eb98c9e 100644
--- a/main/buildkit/assembly-linux.xml
+++ b/main/buildkit/assembly-linux.xml
@@ -28,5 +28,12 @@
 			</includes>
 			<outputDirectory>libs</outputDirectory>
 		</fileSet>
+		<fileSet>
+			<directory>target/linux-secret-service</directory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+			<outputDirectory>libs</outputDirectory>
+		</fileSet>
 	</fileSets>
 </assembly>
\ No newline at end of file
diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml
index 32fa59d67..00344c9a8 100644
--- a/main/buildkit/pom.xml
+++ b/main/buildkit/pom.xml
@@ -62,6 +62,7 @@
 						<configuration>
 							<outputDirectory>${project.build.directory}/libs</outputDirectory>
 							<excludeClassifiers>linux,mac,win</excludeClassifiers>
+							<excludeArtifactIds>dbus-java,secret-service,hkdf,java-utils</excludeArtifactIds>
 						</configuration>
 					</execution>
 					<execution>
@@ -76,6 +77,17 @@
 							<classifier>linux</classifier>
 						</configuration>
 					</execution>
+					<execution>
+						<id>copy-linux-secret-service</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/linux-secret-service</outputDirectory>
+							<includeArtifactIds>dbus-java,secret-service,hkdf,java-utils</includeArtifactIds>
+						</configuration>
+					</execution>
 					<execution>
 						<id>copy-mac-libs</id>
 						<phase>prepare-package</phase>