diff options
| author | Jonah Graham | 2019-07-03 17:56:07 +0000 |
|---|---|---|
| committer | Jonah Graham | 2019-07-03 17:56:07 +0000 |
| commit | 4fe53bb05731260770eb8ba15cf63f73849be023 (patch) | |
| tree | 3b4157ba8532024e1b98d1f2c995f996dbd8f4ba | |
| parent | 230d377d9ffd323826c541ddbbfbe7ca45f52a9d (diff) | |
| download | org.eclipse.cdt-4fe53bb05731260770eb8ba15cf63f73849be023.tar.gz org.eclipse.cdt-4fe53bb05731260770eb8ba15cf63f73849be023.tar.xz org.eclipse.cdt-4fe53bb05731260770eb8ba15cf63f73849be023.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.xml | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -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.1/</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 @@ -442,12 +443,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> |