I manually compared all affected manifest files one by one before and now
There can be small differences additional to fixes; some imported packages don't exist any more.
Note: Those three commits are in a single PR because testing with GF is quite expensive and also I am not sure if GF tests would pass without that revert. And the overall PR is still rather small.
Note: Those three commits are in a single PR because testing with GF is quite expensive and also I am not sure if GF tests would pass without that revert. And the overall PR is still rather small.
mvn clean install -Dhk2.version=3.1.1-SNAPSHOTpassed locally.