From 3f49713898e69bca40db47f653102ff52ac71741 Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Wed, 1 Sep 2021 09:11:29 -0400
Subject: [PATCH] Bug 575654 - fix packaging order

Change-Id: I2d41d42f55a54cc8f0b0b437f78025d9a91aa3c4
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 .../pom.xml                                   | 58 +++++++++++--------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/releng/org.eclipse.remote.proxy.server.product/pom.xml b/releng/org.eclipse.remote.proxy.server.product/pom.xml
index ca141ae5211..64343c99f70 100644
--- a/releng/org.eclipse.remote.proxy.server.product/pom.xml
+++ b/releng/org.eclipse.remote.proxy.server.product/pom.xml
@@ -45,38 +45,46 @@
 						</product>
 					</products>
 				</configuration>
+				<executions>
+		            <execution>
+		              <id>materialize-products</id>
+		              <goals>
+		                <goal>materialize-products</goal>
+		              </goals>
+		            </execution>
+		            <execution>
+		              <id>archive-products</id>
+		                <!--  must run after signing -->
+		                <phase>pre-integration-test</phase>
+		                <goals>
+		                  <goal>archive-products</goal>
+		                </goals>
+            		</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>create-distributions</id>
+						<id>copy-built-proxy-servers-to-individual-bundles</id>
+		                <!--  must run after signing *and* after archiving -->
+						<phase>pre-integration-test</phase>
 						<goals>
-							<goal>materialize-products</goal>
-							<goal>archive-products</goal>
+							<goal>run</goal>
 						</goals>
+						<configuration>
+							<tasks>
+								<copy file="${project.build.directory}/products/proxy.server-linux.gtk.x86_64.tar.gz"
+									tofile="${basedir}/../org.eclipse.remote.proxy.server.linux.x86_64/proxy.server.tar.gz"/>
+								<copy file="${project.build.directory}/products/proxy.server-linux.gtk.ppc64le.tar.gz"
+									tofile="${basedir}/../org.eclipse.remote.proxy.server.linux.ppc64le/proxy.server.tar.gz"/>
+								<copy file="${project.build.directory}/products/proxy.server-macosx.cocoa.x86_64.tar.gz"
+									tofile="${basedir}/../org.eclipse.remote.proxy.server.macosx.x86_64/proxy.server.tar.gz"/>
+							</tasks>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
-				<plugin>
-					<artifactId>maven-antrun-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>copy-built-proxy-servers-to-individual-bundles</id>
-							<phase>package</phase>
-							<goals>
-								<goal>run</goal>
-							</goals>
-							<configuration>
-								<tasks>
-									<copy file="${project.build.directory}/products/proxy.server-linux.gtk.x86_64.tar.gz"
-										tofile="${basedir}/../org.eclipse.remote.proxy.server.linux.x86_64/proxy.server.tar.gz"/>
-									<copy file="${project.build.directory}/products/proxy.server-linux.gtk.ppc64le.tar.gz"
-										tofile="${basedir}/../org.eclipse.remote.proxy.server.linux.ppc64le/proxy.server.tar.gz"/>
-									<copy file="${project.build.directory}/products/proxy.server-macosx.cocoa.x86_64.tar.gz"
-										tofile="${basedir}/../org.eclipse.remote.proxy.server.macosx.x86_64/proxy.server.tar.gz"/>
-								</tasks>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
 		</plugins>
 	</build>