OPENJDK-3591 Manual merge: Attempt to merge ubi9 branch content back to jlink-dev branch.

[sefroberg]

Thanks for submitting your Pull Request!
Attempt to merge UBI9 content back into the jlink-dev branch. I end up trying a manual merge because the auto merge kept removing content from the jlink-dev branch.

https://issues.redhat.com/browse/OPENJDK-3591

Please make sure your PR meets the following requirements:

• A JIRA issue must exist in the OPENJDK project at issues.redhat.com
• Pull Request title should be prefixed with the JIRA issue: [OPENJDK-XYZ] Subject
• Pull Request contains hyperlink to the JIRA issue
• Pull Request contains description of the issue
• Pull Request does not include fixes for issues other than the main ticket
• Attached commits represent units of work and are properly formatted
• You have read and agreed to the Developer Certificate of Origin (DCO) (see CONTRIBUTING.md)
• Every commit contains Signed-off-by: Your Name <[email protected]> - use git commit -s

[jmtd]

Thanks for raising this. It's useful to compare to #556 to see what differs, and fix one or the other.

It's not clear how you composed this. Since it's one commit which is not a merge commit (it only has one parent) you're squashing some history from the ubi9 branch but I don't know what the reference point was.

It looks like tests/arq still exists so it's missing 21f47a ("[OPENJDK-2990] Remove Arquillian test source") from April last year.

[sefroberg]

Thanks for raising this. It's useful to compare to #556 to see what differs, and fix one or the other.

It's not clear how you composed this. Since it's one commit which is not a merge commit (it only has one parent) you're squashing some history from the ubi9 branch but I don't know what the reference point was.

It looks like tests/arq still exists so it's missing 21f47a ("[OPENJDK-2990] Remove Arquillian test source") from April last year.

Hi @jmtd
I merged it using a local file merge. I expected some misses on the merge. I honestly have no idea where the last fork took place between the UBI9 branch and the jlink-dev branch. At one point I started to wonder if the jlink-dev branch proceeded the UBI9 branch.

[sefroberg]

In discussion with @jmtd we agreed this should only be a point of reference for the delta between the ubi9 and jlin-dev branch. PR #556 should be the source for moving forward for the merge.