Port the well working build of jetty-8 to jetty-7 on master
diff --git a/jetty-features/org.eclipse.jetty.product/pom.xml b/jetty-features/org.eclipse.jetty.product/pom.xml
index 78f1746..c4a2946 100644
--- a/jetty-features/org.eclipse.jetty.product/pom.xml
+++ b/jetty-features/org.eclipse.jetty.product/pom.xml
@@ -28,7 +28,8 @@
<description>Prototype: Eclipse Product for Jetty-Equinox, P2 able</description>
<properties>
<tycho.updatesite.with.jre>true</tycho.updatesite.with.jre>
- <tycho.publisher.with.statsUri>http://download.eclipse.org/stats</tycho.publisher.with.statsUri> <tycho.publisher.with.statsTrackedBundleIDs>org.eclipse.jetty.sdk,org.eclipse.jetty.starterkit.sdk,org.eclipse.jetty.starterkit,org.eclipse.jetty.tooling,org.eclipse.pde.junit4.runtime.addon,org.eclipse.pde.junit4.runtime.standalone</tycho.publisher.with.statsTrackedBundleIDs>
+ <tycho.publisher.with.statsUri>http://download.eclipse.org/stats</tycho.publisher.with.statsUri>
+ <tycho.publisher.with.statsTrackedBundleIDs>org.eclipse.jetty.sdk,org.eclipse.jetty.starterkit.sdk,org.eclipse.jetty.starterkit,org.eclipse.jetty.tooling,org.eclipse.pde.junit4.runtime.addon,org.eclipse.pde.junit4.runtime.standalone</tycho.publisher.with.statsTrackedBundleIDs>
</properties>
<build>
<extensions>
@@ -114,7 +115,6 @@
<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>
@@ -125,7 +125,6 @@
<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>
@@ -136,20 +135,18 @@
<execution>
<id>repack</id>
<configuration>
- <inputFile>${project.build.directory}/signed/repository.zip</inputFile>
- <outputFile>${project.build.directory}/packed/repository.zip</outputFile>
+ <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
</configuration>
<phase>generate-test-resources</phase>
<goals>
- <goal>repack</goal>
+ <goal>pack</goal>
</goals>
</execution>
<!-- signing and pack alters tycho checksums so fix them -->
<execution>
<id>fixCheckSums</id>
<configuration>
- <inputFile>${project.build.directory}/packed/repository.zip</inputFile>
- <outputFile>${project.build.directory}/fixed/repository.zip</outputFile>
+ <inputFile>${project.build.directory}/packed/site_assembly.zip</inputFile>
</configuration>
<phase>generate-test-resources</phase>
<goals>
