Fixes a number of errors in the bndrun handling #6401
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some of the changes we made to handle the UI of inherited properties were not correctly
handling all cases. These shortcomings were hidden because we reread the properties
from the file system.
The issue is that the BndEditModel is about the properties in the document while
the resolver handles properties after processing. So we needed to setup a processor
that properly reflected:
For this I hadded a sub-Processor to the bndrun. This subprocessor contained all the
document values (e.g. -include is in there) and intercepted access to the deleted
keys.
However, we accidentially reread the properties of the bndrun sub processor from file. This
worked fine in the workspace but the LauncUtils lets the Maven handler muck around to
add a repository. Unfortuantely, this also set the base directory of the bndrun to a
temporary directory for unknown reasons. So when the properties were read and an
include was found it could not find it.
Then there was an unrelated problem that I think was also masked. It turns out the UI
was updating the model with requirements even if requirements were not changed or
added. This created a null key in the bndrun that never existed. Since this example
used the
-runrequirements
key in an include file, it hid the original value. Andweridly it caused an NPE later.
So uncomfortable many changes ... I guess we need to test this well and probably release
a 7.2 soon.
Fixes #6393
Fixes #6394
Fixes #6394
Signed-off-by: github-actions [email protected]