Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonah Graham2019-07-03 13:56:07 -0400
committerJonah Graham2019-07-03 13:57:42 -0400
commite09163e75add60004d856b242f1a297cbc8077ea (patch)
tree1abf808f71e2916f9d8c61743656bc0a04c523a4
parentfe003c3b8f3846699edd4018aaba534adc8a16b5 (diff)
downloadorg.eclipse.cdt-e09163e75add60004d856b242f1a297cbc8077ea.tar.gz
org.eclipse.cdt-e09163e75add60004d856b242f1a297cbc8077ea.tar.xz
org.eclipse.cdt-e09163e75add60004d856b242f1a297cbc8077ea.zip
[releng] Change default to be baseline compare and replace is not run
Use baseline-compare-and-replace profile to run it. Change-Id: Iaacfad8f920f28cf773763e804be90ba8c5f30cf
-rw-r--r--pom.xml24
1 files changed, 12 insertions, 12 deletions
diff --git a/pom.xml b/pom.xml
index 6a34416588..ad2213922d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,16 +29,17 @@
<help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.10/</help-docs-eclipserun-repo>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git</tycho.scmUrl>
<base.test.vmargs>-Xms256m -Xmx512m -ea</base.test.vmargs>
- <!-- these parameters are to control baseline replace and compare. On a local build you may want
+ <comparator.repo>https://download.eclipse.org/tools/cdt/releases/9.8/cdt-9.8.1/</comparator.repo>
+ <!-- these parameters are to control baseline replace and compare. On a local build you want
to avoid baseline replace and compare, especially if you have different versions of Java than
- the baseline was built with.
+ the baseline was built with. This is the default.
- To set all the settings in one go to skip, use the skip-baseline profile
+ If you have the same version of Java as the build machine you can run baseline comparison and
+ replace. To do that run with the baseline-compare-and-replace profile.
-->
- <comparator.repo>https://download.eclipse.org/tools/cdt/releases/9.8/cdt-9.8.0/</comparator.repo>
- <compare-version-with-baselines.skip>false</compare-version-with-baselines.skip>
- <replace-version-with-baselines.mode>fail</replace-version-with-baselines.mode>
- <replace-version-with-baselines.replace>all</replace-version-with-baselines.replace>
+ <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
+ <replace-version-with-baselines.mode>disable</replace-version-with-baselines.mode>
+ <replace-version-with-baselines.replace>none</replace-version-with-baselines.replace>
<!--
Valid options: error, warning, and ignore
jgit.dirtyWorkingTree checking was added as of Tycho 0.19.0
@@ -443,12 +444,11 @@
</properties>
</profile>
<profile>
- <id>skip-baseline</id>
+ <id>baseline-compare-and-replace</id>
<properties>
- <comparator.repo></comparator.repo>
- <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
- <replace-version-with-baselines.mode>disable</replace-version-with-baselines.mode>
- <replace-version-with-baselines.replace>none</replace-version-with-baselines.replace>
+ <compare-version-with-baselines.skip>false</compare-version-with-baselines.skip>
+ <replace-version-with-baselines.mode>fail</replace-version-with-baselines.mode>
+ <replace-version-with-baselines.replace>all</replace-version-with-baselines.replace>
</properties>
</profile>
<profile>

Back to the top