Switch to the CBI jar signer
diff --git a/development/org.eclipse.libra.releng/pom.xml b/development/org.eclipse.libra.releng/pom.xml
index 39b09ba..3921c55 100644
--- a/development/org.eclipse.libra.releng/pom.xml
+++ b/development/org.eclipse.libra.releng/pom.xml
@@ -9,7 +9,7 @@
<name>Libra Parent POM</name>
<properties>
- <tycho-version>0.13.0</tycho-version>
+ <tycho-version>0.18.0</tycho-version>
<eclipse-site>http://download.eclipse.org/eclipse/updates/4.3milestones/</eclipse-site>
<emf-site>http://download.eclipse.org/modeling/emf/emf/updates/2.9milestones/</emf-site>
<dtp-site>http://download.eclipse.org/datatools/downloads/drops/M_updates_1.11.0/</dtp-site>
@@ -170,11 +170,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.eclipse.dash.maven</groupId>
- <artifactId>eclipse-signing-maven-plugin</artifactId>
- <version>1.0.5</version>
- </plugin>
</plugins>
</pluginManagement>
</build>
@@ -219,12 +214,8 @@
<pluginRepositories>
<pluginRepository>
- <id>maven-eclipse-central</id>
- <url>http://maven.eclipse.org/nexus/content/groups/central/</url>
- </pluginRepository>
- <pluginRepository>
- <id>maven-eclipse-public</id>
- <url>http://maven.eclipse.org/nexus/content/groups/public/</url>
+ <id>cbi-releases</id>
+ <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
</pluginRepository>
</pluginRepositories>
diff --git a/development/org.eclipse.libra.repository/pom.xml b/development/org.eclipse.libra.repository/pom.xml
index 4bddab4..db36600 100644
--- a/development/org.eclipse.libra.repository/pom.xml
+++ b/development/org.eclipse.libra.repository/pom.xml
@@ -32,86 +32,77 @@
<profiles>
<profile>
- <id>build-server</id>
+ <id>eclipse-sign</id>
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.dash.maven</groupId>
- <artifactId>eclipse-signing-maven-plugin</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includePackedArtifacts>false</includePackedArtifacts>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tycho-version}</version>
<executions>
- <!-- Pack the p2 repository. -->
<execution>
- <id>pack</id>
- <configuration>
- <inputFile>${p2repo-zip-path}</inputFile>
- </configuration>
- <phase>package</phase>
+ <id>pack200-normalize</id>
<goals>
- <goal>pack</goal>
+ <goal>normalize</goal>
</goals>
- </execution>
- <!-- Sign the p2 repository -->
- <execution>
- <id>sign</id>
- <configuration>
- <inputFile>${p2repo-zip-path}</inputFile>
- <signerInputDirectory>/home/data/httpd/download-staging.priv/webtools/libra</signerInputDirectory>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- <!-- Repack the p2 repository -->
- <execution>
- <id>repack</id>
- <configuration>
- <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile> <!-- this is output from signer mojo -->
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <!-- Signing and packing alters checksums so fix them -->
- <execution>
- <id>fixCheckSums</id>
- <phase>package</phase>
- <goals>
- <goal>fixCheckSums</goal>
- </goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>1.0.4</version>
<executions>
<execution>
- <id>deploy</id>
- <phase>install</phase>
+ <id>sign</id>
<goals>
- <goal>run</goal>
+ <goal>sign</goal>
</goals>
- <configuration>
- <tasks>
- <delete includeemptydirs="false">
- <fileset
- dir="${p2-publish-dir}">
- <include name="**" />
- </fileset>
- </delete>
- <copy includeemptydirs="false"
- todir="${p2-publish-dir}">
- <fileset dir="target/checksumFix">
- <include name="**" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tycho-version}</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>${tycho-version}</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>
</profile>
</profiles>
