From b2ed22cc17b0946df3e9f019ed3023a087028932 Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Mon, 1 Jul 2019 15:18:59 -0400
Subject: [PATCH] Try to deploy dependencies.

Change-Id: Ic57da40bd49fa78d54cadf2b77cb058e68c3d7bb
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 releng/org.eclipse.remote.deploy/assembly.xml | 26 ++++++++
 releng/org.eclipse.remote.deploy/pom.xml      | 62 ++++++++++++-------
 2 files changed, 67 insertions(+), 21 deletions(-)
 create mode 100644 releng/org.eclipse.remote.deploy/assembly.xml

diff --git a/releng/org.eclipse.remote.deploy/assembly.xml b/releng/org.eclipse.remote.deploy/assembly.xml
new file mode 100644
index 00000000000..a6cdb50b844
--- /dev/null
+++ b/releng/org.eclipse.remote.deploy/assembly.xml
@@ -0,0 +1,26 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+	<id>assemble</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<dependencySets>
+		<dependencySet>
+			<useProjectArtifact>false</useProjectArtifact>
+			<useTransitiveDependencies>false</useTransitiveDependencies>
+			<unpack>false</unpack>
+		</dependencySet>
+	</dependencySets>
+
+	<fileSets>
+		<fileSet>
+			<directory>${project.build.directory}/dependency</directory>
+			<outputDirectory>/</outputDirectory>
+		</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 def564e6c0e..bb53ca01e6b 100644
--- a/releng/org.eclipse.remote.deploy/pom.xml
+++ b/releng/org.eclipse.remote.deploy/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -15,11 +16,11 @@
 	<artifactId>remote-core</artifactId>
 	<version>3.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	
+
 	<properties>
-  		<maven.deploy.skip>false</maven.deploy.skip>
+		<maven.deploy.skip>false</maven.deploy.skip>
 	</properties>
-	
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -35,23 +36,42 @@
 
 	<build>
 		<plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.1.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <!-- configure the plugin here -->
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+			<!-- Generate the dependencies and copy to the dependency directory in the plugin -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.1.1</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- Create the assembly -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2.1</version>
+				<configuration>
+					<descriptors>
+						<descriptor>assembly.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>