Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.releng.products
diff --git a/jetty-features/org.eclipse.jetty.product/pom.xml b/jetty-features/org.eclipse.jetty.product/pom.xml
index 8b3fbbd..78f1746 100644
--- a/jetty-features/org.eclipse.jetty.product/pom.xml
+++ b/jetty-features/org.eclipse.jetty.product/pom.xml
@@ -114,6 +114,7 @@
<id>pack</id>
<configuration>
<inputFile>${project.build.directory}/repository.zip</inputFile>
+ <outputFile>${project.build.directory}/packed/repository.zip</outputFile>
</configuration>
<phase>generate-test-resources</phase>
<goals>
@@ -124,6 +125,7 @@
<id>sign</id>
<configuration>
<inputFile>${project.build.directory}/packed/repository.zip</inputFile>
+ <outputFile>${project.build.directory}/signed/repository.zip</outputFile>
<signerInputDirectory>/home/data/httpd/download-staging.priv/rt/jetty/wksigning</signerInputDirectory>
</configuration>
<phase>generate-test-resources</phase>
@@ -134,18 +136,20 @@
<execution>
<id>repack</id>
<configuration>
- <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
+ <inputFile>${project.build.directory}/signed/repository.zip</inputFile>
+ <outputFile>${project.build.directory}/packed/repository.zip</outputFile>
</configuration>
<phase>generate-test-resources</phase>
<goals>
- <goal>pack</goal>
+ <goal>repack</goal>
</goals>
</execution>
<!-- signing and pack alters tycho checksums so fix them -->
<execution>
<id>fixCheckSums</id>
<configuration>
- <inputFile>${project.build.directory}/packed/site_assembly.zip</inputFile>
+ <inputFile>${project.build.directory}/packed/repository.zip</inputFile>
+ <outputFile>${project.build.directory}/fixed/repository.zip</outputFile>
</configuration>
<phase>generate-test-resources</phase>
<goals>
