tycho-p2-extras-plugin::compare-version-with-baselines Bug in Tycho 2.2.0 .. 2.6.0 for features with root files

[beyerjsb]

We are seeing compare-version-with-baselines failing for features with root files. It works fine for features without root files. It's happening in Tycho 2.2.0 to Tycho 2.6.0 and also in Tycho 2.7.0-SNAPSHOT. It is not happening in Tycho 2.1.0.

Error message is:

[ERROR] Failed to execute goal org.eclipse.tycho.extras:tycho-p2-extras-plugin:2.5.0:compare-version-with-baselines (default) on project feature: Baseline and reactor have same fully qualified version, but with different content
[ERROR] different
[ERROR]    <files from feature IU>: not present in baseline
[ERROR]    <files from root IU>: present in baseline only

It seems it tries to compare the local main feature IU jar with the root files IU jar from the baseline.

See attached sample repo.

Run
mvn install
It will produce a repo to compare against (required step).
Since you don’t change anything, a compare with itself should result in no issues.

Run
mvn install -Pdo-baseline
It will fail with

[ERROR] Failed to execute goal org.eclipse.tycho.extras:tycho-p2-extras-plugin:2.5.0:compare-version-with-baselines (default) on project feature: Baseline and reactor have same fully qualified version, but with different content
[ERROR] different
[ERROR]    META-INF/MANIFEST.MF: not present in baseline
[ERROR]    example.txt: present in baseline only
[ERROR]    feature.xml: not present in baseline

Run
mvn install -Pdo-baseline -Dtycho-version=2.1.0
It will run successfully and compare without issues – it does not happen in Tycho 2.1.0

Run
mvn install -Pdo-baseline -Dtycho-version=2.6.0
It will fail with same error message – it’s not fixed in Tycho 2.6.0
tychobug.zip

[mlehmannm]

After debugging, it seems to me that tycho compares the main artifact and the attached artifact that contains the root files.
The attachment adds two lines to fix at least the provided example. I did not provide a pull request, because i don't know if this fixes all case. Please review the attached patch
tycho-562.patch.txt
.

[mickaelistria]

I think it's worth a PR, and even better if you can add some integration test that showcases the bug and validates the fix.

[laeubi]

@mlehmannm pleas still provide a PR:

1. we cannot accept contributions from outside contributors without a valid ECA
2. The build performs several unit- and integrationtest so we can see if it passes or not.

because of the second, please consider adding an integration test that shows this case fails.

[laeubi]

Thanks for the fix, is there anything left for now or can we close this?

[beyerjsb]

Can confirm that the latest 2.7.0-SNAPSHOT fixes the issue. It also works (just checked it) with features and root folders that are not coincidentally named root (e.g. build.properties says root=ex instead of root=root).

Thanks!

[laeubi]

@beyerjsb thanks for verification