From 7741bd98f7b08a281c4b7f60e60c5839f315f760 Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Fri, 7 Jun 2019 16:45:27 -0400
Subject: [PATCH] Bug 547894: Baseline replace must happen after pack200

The configuration for baseline replacement needs to be split.

This may be a bug in Tycho, but I cannot tell. It seems to me the
configuration about ignoredPatterns should be read from the
configuration block in the execution block, but it isn't.

Change-Id: I35e3f4007b0afc21d8bd81d5b07f76581879bc76
---
 pom.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5091ef08154..edb812d0f48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -750,16 +750,18 @@
 								<goal>p2-metadata</goal>
 							</goals>
 							<phase>verify</phase>
+							<configuration>
+								<baselineMode>fail</baselineMode>
+								<baselineReplace>all</baselineReplace>
+								<baselineRepositories>
+									<repository>
+										<url>${comparator.repo}</url>
+									</repository>
+								</baselineRepositories>
+							</configuration>
 						</execution>
 					</executions>
 					<configuration>
-						<baselineMode>fail</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>