Change signing from Maven project dash plugin to CBI plugin
- Rework signing, use CBI plugin instead of project dash
- Create eclipse-sign build profile
- Update Tycho from 0.16 to 0.18
- Update Surefire from 2.9 to 2.15
diff --git a/releng/org.eclipse.rap.incubator.releng/parent/pom.xml b/releng/org.eclipse.rap.incubator.releng/parent/pom.xml
index 359c9fa..dde179d 100644
--- a/releng/org.eclipse.rap.incubator.releng/parent/pom.xml
+++ b/releng/org.eclipse.rap.incubator.releng/parent/pom.xml
@@ -20,16 +20,16 @@
<packaging>pom</packaging>
<properties>
- <tycho-version>0.16.0</tycho-version>
- <tycho-extras-version>0.16.0</tycho-extras-version>
- <signing-plugin-version>1.0.5</signing-plugin-version>
- <surefire-version>2.9</surefire-version>
+ <tycho-version>0.18.0</tycho-version>
+ <tycho-extras-version>${tycho-version}</tycho-extras-version>
+ <signing-plugin-version>1.0.1</signing-plugin-version>
+ <surefire-version>2.15</surefire-version>
<junit-version>4.8.2</junit-version>
<mockito-version>1.9.5</mockito-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<rap-repository>http://download.eclipse.org/rt/rap/nightly/runtime/</rap-repository>
<rap-incubator-repository>http://download.eclipse.org/rt/rap/incubator/nightly/</rap-incubator-repository>
- <baseline.repository>${rap-incubator-repository}</baseline.repository>
+ <baseline-repository>${rap-incubator-repository}</baseline-repository>
</properties>
<prerequisites>
@@ -64,18 +64,6 @@
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>maven.eclipse.org</id>
- <url>http://maven.eclipse.org/nexus/content/repositories/milestone-indigo</url>
- </pluginRepository>
- <pluginRepository>
- <id>tycho-snapshots</id>
- <url>https://oss.sonatype.org/content/groups/public/</url>
- </pluginRepository>
- </pluginRepositories>
-
-
<build>
<plugins>
@@ -88,20 +76,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>plugin-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<dependencies>
@@ -113,9 +87,11 @@
</dependencies>
<configuration>
<timestampProvider>jgit</timestampProvider>
+<!-- generate new qualifier even if it is only the pom.xml that changed
<jgit.ignore>
pom.xml
</jgit.ignore>
+ -->
<format>yyyyMMdd-HHmm</format>
</configuration>
</plugin>
@@ -127,19 +103,24 @@
<configuration>
<baselineRepositories>
<repository>
- <url>${baseline.repository}</url>
+ <url>${baseline-repository}</url>
</repository>
</baselineRepositories>
</configuration>
</plugin>
<plugin>
- <groupId>org.eclipse.dash.maven</groupId>
- <artifactId>eclipse-signing-maven-plugin</artifactId>
- <version>${signing-plugin-version}</version>
- <configuration>
- <signerInputDirectory>/home/data/httpd/download-staging.priv/rt/rap</signerInputDirectory>
- </configuration>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>plugin-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -178,6 +159,94 @@
</plugins>
</build>
+ <profiles>
+
+ <profile>
+ <id>eclipse-sign</id>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>m2e-cbi</id>
+ <url>http://download.eclipse.org/technology/m2e/maven/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includePackedArtifacts>true</includePackedArtifacts>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ <executions>
+ <execution>
+ <id>pack200-normalize</id>
+ <goals>
+ <goal>normalize</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>${signing-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ <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>
+ <version>${tycho-version}</version>
+ <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>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
diff --git a/releng/org.eclipse.rap.incubator.releng/repository/pom.xml b/releng/org.eclipse.rap.incubator.releng/repository/pom.xml
index af4c146..ee3b76d 100644
--- a/releng/org.eclipse.rap.incubator.releng/repository/pom.xml
+++ b/releng/org.eclipse.rap.incubator.releng/repository/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (C) 2011, 2012 EclipseSource and others
+ Copyright (C) 2011, 2013 EclipseSource and others
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -38,82 +38,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>pack-and-sign</id>
- <activation>
- <property>
- <name>sign</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.dash.maven</groupId>
- <artifactId>eclipse-signing-maven-plugin</artifactId>
- <version>1.0.4</version>
- <executions>
- <execution>
- <id>pack</id>
- <configuration>
- <inputFile>${project.build.directory}/incubator-repository.zip</inputFile>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <execution>
- <id>sign</id>
- <configuration>
- <inputFile>${project.build.directory}/packed/incubator-repository.zip</inputFile>
- <signerInputDirectory>/home/data/httpd/download-staging.priv/rt/rap</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>fix-checksums-for-signed-content</id>
- <configuration>
- <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
- <unzipDir>${project.build.directory}/fixedSigned</unzipDir>
- <artifactsXml>${project.build.directory}/fixedSigned/artifacts.xml</artifactsXml>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>fixCheckSums</goal>
- </goals>
- </execution>
- <execution>
- <id>fix-checksums-for-packed-content</id>
- <configuration>
- <inputFile>${project.build.directory}/packed/site_assembly.zip</inputFile>
- <unzipDir>${project.build.directory}/fixedPacked</unzipDir>
- <artifactsXml>${project.build.directory}/fixedPacked/artifacts.xml</artifactsXml>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>fixCheckSums</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/releng/org.eclipse.rap.incubator.releng/scripts/build.sh b/releng/org.eclipse.rap.incubator.releng/scripts/build.sh
index 88bfa24..c011dfa 100755
--- a/releng/org.eclipse.rap.incubator.releng/scripts/build.sh
+++ b/releng/org.eclipse.rap.incubator.releng/scripts/build.sh
@@ -28,10 +28,10 @@
REPOSITORY_NAME="org.eclipse.rap.incubator.${COMPONENT_NAME}"
BUILD_PROJECT_PATH="releng/org.eclipse.rap.${COMPONENT_NAME}.build"
-SIGN=false
+SIGNPROFILE=""
if [ X"$BUILD_TYPE" = XS ]
then
- SIGN=true
+ SIGNPROFILE="-Peclipse-sign"
fi
######################################################################
@@ -47,7 +47,7 @@
echo "Repository name: ${REPOSITORY_NAME}"
echo "Build project path: ${BUILD_PROJECT_PATH}"
echo "Build type: ${BUILD_TYPE}"
-echo "Signing enabled: ${SIGN}"
+echo "Sign Profile: ${SIGNPROFILE}"
echo "RAP Runtime library: ${RAP_REPOSITORY}"
######################################################################
@@ -79,7 +79,7 @@
BUILD_DIRECTORY=${WORKSPACE}/${REPOSITORY_NAME}/${BUILD_PROJECT_PATH}
echo "Starting build in ${BUILD_DIRECTORY}"
cd ${BUILD_DIRECTORY}
-${MVN} -e clean package -Dsign=${SIGN} -Dmaven.repo.local=${MAVEN_LOCAL_REPO_PATH} -Drap-repository=${RAP_REPOSITORY}
+${MVN} -e clean package $SIGNPROFILE -Dmaven.repo.local=${MAVEN_LOCAL_REPO_PATH} -Drap-repository=${RAP_REPOSITORY}
EXITCODE=$?
if [ "$EXITCODE" != "0" ]; then
echo "Maven exited with error code " + ${EXITCODE}
