Bug 575654 - fix packaging order Change-Id: I2d41d42f55a54cc8f0b0b437f78025d9a91aa3c4 Signed-off-by: Greg Watson <g.watson@computer.org>
diff --git a/releng/org.eclipse.remote.proxy.server.product/pom.xml b/releng/org.eclipse.remote.proxy.server.product/pom.xml index ca141ae..64343c9 100644 --- a/releng/org.eclipse.remote.proxy.server.product/pom.xml +++ b/releng/org.eclipse.remote.proxy.server.product/pom.xml
@@ -46,37 +46,45 @@ </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>