From 84381c7a23ada610ec357553c66e3285312143b4 Mon Sep 17 00:00:00 2001
From: William Riley <william.riley@renesas.com>
Date: Thu, 20 Dec 2018 08:00:52 -0500
Subject: [PATCH] [releng] Try to fix signing with baseline replacement

Change-Id: I1b1b63e095c9309836ec0850c7afe6adf09ebf51
---
 pom.xml | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0e8a8eef3bb..881b2c6c5db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -767,19 +767,28 @@
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-p2-plugin</artifactId>
 					<version>${tycho-version}</version>
-					<configuration>
-						<baselineMode>warn</baselineMode>
-						<baselineReplace>all</baselineReplace>
-						<baselineRepositories>
-							<repository>
-								<url>${comparator.repo}</url>
-							</repository>
-						</baselineRepositories>
-						<ignoredPatterns>
-							<pattern>META-INF/ECLIPSE_.RSA</pattern>
-							<pattern>META-INF/ECLIPSE_.SF</pattern>
-						</ignoredPatterns>
-					</configuration>
+					<executions>
+						<execution>
+							<id>baselinereplace-p2-metadata</id>
+							<goals>
+								<goal>p2-metadata</goal>
+							</goals>
+							<phase>verify</phase>
+							<configuration>
+								<baselineMode>warn</baselineMode>
+								<baselineReplace>all</baselineReplace>
+								<baselineRepositories>
+									<repository>
+										<url>${comparator.repo}</url>
+									</repository>
+								</baselineRepositories>
+								<ignoredPatterns>
+									<pattern>META-INF/ECLIPSE_.RSA</pattern>
+									<pattern>META-INF/ECLIPSE_.SF</pattern>
+								</ignoredPatterns>
+							</configuration>
+						</execution>
+					</executions>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>