Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonah Graham2019-06-07 16:45:27 -0400
committerJonah Graham2019-06-09 09:15:13 -0400
commit8f93e5b26e7422d0e9a7d64922429f9555644d70 (patch)
tree6db13ce591d52d2430371aba5e54885d3bc8b429
parent87da77a7e2cd9a664bbf0a7305453762930b31bd (diff)
downloadorg.eclipse.cdt-cdt_9_7.tar.gz
org.eclipse.cdt-cdt_9_7.tar.xz
org.eclipse.cdt-cdt_9_7.zip
Bug 547894: Baseline replace must happen after pack200cdt_9_7
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
-rw-r--r--pom.xml16
1 files changed, 9 insertions, 7 deletions
diff --git a/pom.xml b/pom.xml
index c7c64f8489..9e3d3a384a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -769,16 +769,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>

Back to the top