From e64bd10f499e040d5797221381389db40ca49555 Mon Sep 17 00:00:00 2001
From: Thanh Ha
Date: Wed, 20 Nov 2013 09:20:20 +0100
Subject: [PATCH] 422061 - NatTable builds depend on missing 
 eclipse-signing-maven-plugin

Swaps out the old DASH eclipse signer for the newer CBI jarsigner to
perform signing.

This patch adds a new profile "sign" which when called via -Psign will
sign each individual jars using the Eclipse signing infrastructure.

The result of the build can be retrieved in the
updatesite/target/repository directory.

Signed-off-by: Thanh Ha <thanh.ha@eclipse.org>---
 org.eclipse.nebula.widgets.nattable.parent/pom.xml |  31 ++++
 .../pom.xml                                        | 201 +++++++--------------
 2 files changed, 100 insertions(+), 132 deletions(-)

diff --git a/org.eclipse.nebula.widgets.nattable.parent/pom.xml b/org.eclipse.nebula.widgets.nattable.parent/pom.xml
index e8ac1e74..9e18c760 100644
--- a/org.eclipse.nebula.widgets.nattable.parent/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.parent/pom.xml
@@ -36,8 +36,16 @@
 
 	<properties>
 		<tycho-version>0.19.0</tycho-version>
+        <cbi-version>1.0.5</cbi-version>
 	</properties>
 
+  <pluginRepositories>
+    <pluginRepository>
+      <id>cbi</id>
+      <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -106,4 +114,27 @@
 		</pluginManagement>
 	</build>
 
+  <profiles>
+    <profile>
+      <id>sign</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.cbi.maven.plugins</groupId>
+            <artifactId>eclipse-jarsigner-plugin</artifactId>
+            <version>${cbi-version}</version>
+            <executions>
+              <execution>
+                <id>sign</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml b/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml
index 5f96df6a..a8efab80 100644
--- a/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml
@@ -1,132 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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 http://www.eclipse.org/legal/epl-v10.html -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<artifactId>parent</artifactId>
-		<groupId>org.eclipse.nebula.widgets.nattable</groupId>
-		<version>1.0.1-SNAPSHOT</version>
-		<relativePath>../org.eclipse.nebula.widgets.nattable.parent</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.nebula.widgets.nattable.updatesite</artifactId>
-	<packaging>eclipse-repository</packaging>
-
-	<name>NatTable Update Site</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>assembly.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/target/repository</outputDirectory>
-							<resources>
-								<resource>
-									<directory>.</directory>
-									<includes>
-										<include>index.html</include>
-										<include>web/*</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>build-server</id>
-			<pluginRepositories>
-				<pluginRepository>
-					<id>Eclipse Nexus</id>
-					<url>http://maven.eclipse.org/nexus/content/repositories/public/</url>
-				</pluginRepository>
-			</pluginRepositories>
-			
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.dash.maven</groupId>
-						<artifactId>eclipse-signing-maven-plugin</artifactId>
-						<version>1.0.5</version>
-						<executions>
-							<execution>
-								<id>pack</id>
-								<configuration>
-									<inputFile>${project.build.directory}/${project.artifactId}-${project.version}-site.zip</inputFile>
-								</configuration>
-								<phase>package</phase>
-								<goals>
-									<goal>pack</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>sign</id>
-								<configuration>
-									<inputFile>${project.build.directory}/${project.artifactId}-${project.version}-site.zip</inputFile>
-									<signerInputDirectory>/home/data/httpd/download-staging.priv/technology/nebula/nattable</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>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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 http://www.eclipse.org/legal/epl-v10.html -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>parent</artifactId>
+		<groupId>org.eclipse.nebula.widgets.nattable</groupId>
+		<version>1.0.1-SNAPSHOT</version>
+		<relativePath>../org.eclipse.nebula.widgets.nattable.parent</relativePath>
+	</parent>
+
+	<artifactId>org.eclipse.nebula.widgets.nattable.updatesite</artifactId>
+	<packaging>eclipse-repository</packaging>
+
+	<name>NatTable Update Site</name>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>assembly.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/target/repository</outputDirectory>
+							<resources>
+								<resource>
+									<directory>.</directory>
+									<includes>
+										<include>index.html</include>
+										<include>web/*</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
-- 
cgit v1.2.3