attempt to fix build signing (2)
diff --git a/releng/org.eclipse.m2m.atl.update/pom.xml b/releng/org.eclipse.m2m.atl.update/pom.xml
index a816880..8ed1709 100644
--- a/releng/org.eclipse.m2m.atl.update/pom.xml
+++ b/releng/org.eclipse.m2m.atl.update/pom.xml
@@ -98,79 +98,76 @@
</property>
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>1.0.5</version>
- <executions>
- <execution>
- <!-- Pack the p2 repository. -->
- <id>pack</id>
- <configuration>
- <inputFile>${project.build.directory}/${project.artifactId}.zip</inputFile>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <execution>
- <!-- Sign the p2 repository -->
- <id>sign</id>
- <configuration>
- <inputFile>${project.build.directory}/${project.artifactId}.zip</inputFile>
- <signerInputDirectory>/home/data/httpd/download-staging.priv/m2m/atl</signerInputDirectory>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- <execution>
- <!-- Repack the p2 repository -->
- <id>repack</id>
- <configuration>
- <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <execution>
- <!-- Signing and packing alters checksums so fix them -->
- <id>fixCheckSums</id>
- <phase>package</phase>
- <goals>
- <goal>fixCheckSums</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>replace-unsigned-repository-by-signed-one</id>
- <phase>verify</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <!-- prepare zip repo and repo for archiving -->
- <move file="${project.build.directory}/repository" tofile="${project.build.directory}/repository-not-signed"/>
- <move file="${project.build.directory}/checksumFix" tofile="${project.build.directory}/repository"/>
- <move file="${project.build.directory}/${project.artifactId}.zip" tofile="${project.build.directory}/${project.artifactId}-not-signed.zip"/>
- <zip destfile="${project.build.directory}/${project.artifactId}.zip" basedir="${project.build.directory}/repository"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>0.18.0</version>
+ <configuration>
+ <includePackedArtifacts>false</includePackedArtifacts>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>0.18.0</version>
+ <executions>
+ <execution>
+ <id>pack200-normalize</id>
+ <goals>
+ <goal>normalize</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>1.0.5</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>0.18.0</version>
+ <executions>
+ <execution>
+ <id>pack200-pack</id>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>0.18.0</version>
+ <executions>
+ <execution>
+ <id>p2-metadata</id>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <defaultP2Metadata>false</defaultP2Metadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<pluginRepositories>
<pluginRepository>
