From 9565430a5bae137b8b532e47c286208f82e4a20e Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Wed, 3 Jul 2019 19:25:56 -0400
Subject: [PATCH] Build uber jar.

Change-Id: Ia200cc07f4c73b288d1c6626de89216d269dc1f1
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 releng/org.eclipse.remote.deploy/assembly.xml | 22 ++++++-------------
 releng/org.eclipse.remote.deploy/pom.xml      |  5 ++++-
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/releng/org.eclipse.remote.deploy/assembly.xml b/releng/org.eclipse.remote.deploy/assembly.xml
index ab46f1bf765..08df261b713 100644
--- a/releng/org.eclipse.remote.deploy/assembly.xml
+++ b/releng/org.eclipse.remote.deploy/assembly.xml
@@ -8,19 +8,11 @@
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
 
-	<dependencySets>
-		<dependencySet>
-			<useProjectArtifact>false</useProjectArtifact>
-			<useTransitiveDependencies>false</useTransitiveDependencies>
-			<unpack>true</unpack>
-		</dependencySet>
-	</dependencySets>
-
-	<fileSets>
-		<fileSet>
-			<directory>${project.build.directory}/dependency</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-	</fileSets>
-
+    <fileSets>
+      <fileSet>
+        <directory>${project.build.directory}/dependency/</directory>
+        <outputDirectory>/</outputDirectory>
+        <useDefaultExcludes>true</useDefaultExcludes>
+      </fileSet>
+    </fileSets>
 </assembly>
\ No newline at end of file
diff --git a/releng/org.eclipse.remote.deploy/pom.xml b/releng/org.eclipse.remote.deploy/pom.xml
index ba83ff3519f..07b046c24e6 100644
--- a/releng/org.eclipse.remote.deploy/pom.xml
+++ b/releng/org.eclipse.remote.deploy/pom.xml
@@ -49,7 +49,9 @@
 							<goal>unpack-dependencies</goal>
 						</goals>
 						<configuration>
-							<useRepositoryLayout>true</useRepositoryLayout>
+							<outputDirectory>${project.build.directory}/dependency</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
 						</configuration>
 					</execution>
 				</executions>
@@ -63,6 +65,7 @@
 					<descriptors>
 						<descriptor>assembly.xml</descriptor>
 					</descriptors>
+					<appendAssemblyId>false</appendAssemblyId>
 				</configuration>
 				<executions>
 					<execution>