Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2013-09-30 10:49:38 -0400
committerMatthias Sohn2013-09-30 11:00:38 -0400
commitce1be293d9be07a9f9a2ec66261ba81b490d7118 (patch)
tree5ac9c576271bffba5c7c9415263ec46b923c7d04
parentdc4a6439fa8e8ca2785cdf149b9ac3b757372f75 (diff)
downloadegit-github-ce1be293d9be07a9f9a2ec66261ba81b490d7118.tar.gz
egit-github-ce1be293d9be07a9f9a2ec66261ba81b490d7118.tar.xz
egit-github-ce1be293d9be07a9f9a2ec66261ba81b490d7118.zip
Update build to use CBI jarsigner plugin and Tycho 0.18.1
The dash signing plugin has been retired hence we need to update our build to use the CBI jarsigner plugin for signing build results. Change-Id: I0046663afdacd07460267f05085f79ae4a69218d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.mylyn.github-site/pom.xml63
-rw-r--r--pom.xml162
2 files changed, 160 insertions, 65 deletions
diff --git a/org.eclipse.mylyn.github-site/pom.xml b/org.eclipse.mylyn.github-site/pom.xml
index 3c3404b1..0d3c1d3b 100644
--- a/org.eclipse.mylyn.github-site/pom.xml
+++ b/org.eclipse.mylyn.github-site/pom.xml
@@ -23,11 +23,6 @@
<name>Eclipse EGit Mylyn GitHub Repository</name>
- <properties>
- <p2repo-zip-path>${project.build.directory}/github-updatesite-${project.version}.zip</p2repo-zip-path>
- <signer-input-directory>/home/data/httpd/download-staging.priv/egit-github</signer-input-directory>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -40,56 +35,13 @@
</plugin>
</plugins>
</build>
- <profiles>
+
+ <profiles>
<profile>
- <id>build-server</id>
+ <id>publish</id>
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.dash.maven</groupId>
- <artifactId>eclipse-signing-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>pack</id>
- <configuration>
- <inputFile>${p2repo-zip-path}</inputFile>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <execution>
- <id>sign</id>
- <configuration>
- <inputFile>${p2repo-zip-path}</inputFile>
- <signerInputDirectory>${signer-input-directory}</signerInputDirectory>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- <execution>
- <id>repack</id>
- <configuration>
- <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <execution>
- <id>fixCheckSums</id>
- <phase>package</phase>
- <goals>
- <goal>fixCheckSums</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -108,7 +60,7 @@
</delete>
<copy includeemptydirs="false"
todir="${download-publish-path}">
- <fileset dir="target/checksumFix">
+ <fileset dir="target/repository/">
<include name="**" />
</fileset>
</copy>
@@ -117,9 +69,8 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
- </profile>
+ </plugins>
+ </build>
+ </profile>
</profiles>
-
</project>
diff --git a/pom.xml b/pom.xml
index 7110e277..1cdfa0d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,8 @@
</licenses>
<properties>
- <tycho-version>0.17.0</tycho-version>
+ <tycho-version>0.18.1</tycho-version>
+ <tycho-extras-version>0.18.1</tycho-extras-version>
<egit-site>file:/${basedir}/../../egit/org.eclipse.egit.repository/target/repository</egit-site>
<platform-version-name>kepler</platform-version-name>
<mylyn-site>http://download.eclipse.org/mylyn/releases/3.7</mylyn-site>
@@ -85,8 +86,8 @@
<pluginRepositories>
<pluginRepository>
- <id>maven.eclipse.org</id>
- <url>http://maven.eclipse.org/nexus/content/repositories/milestone-indigo/</url>
+ <id>repo.eclipse.org.cbi-releases</id>
+ <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
</pluginRepository>
</pluginRepositories>
@@ -166,7 +167,27 @@
</environments>
</configuration>
</plugin>
- <plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.2</version>
@@ -213,11 +234,11 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.eclipse.dash.maven</groupId>
- <artifactId>eclipse-signing-maven-plugin</artifactId>
- <version>1.0.3</version>
- </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>1.0.4</version>
+ </plugin>
</plugins>
</pluginManagement>
<sourceDirectory>src/</sourceDirectory>
@@ -265,6 +286,129 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>eclipse-sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <includePackedArtifacts>true</includePackedArtifacts>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <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>
+ <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>
+ <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>
+ <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>
+ <profile>
+ <id>eclipse-pack</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <includePackedArtifacts>true</includePackedArtifacts>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pack200-normalize</id>
+ <goals>
+ <goal>normalize</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pack200-pack</id>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>p2-metadata</id>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <defaultP2Metadata>false</defaultP2Metadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<distributionManagement>

Back to the top