FISH-8635 FISH-8653 Upgrade HK2 and Introduce EE11 Shim #6693
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Initial shim exports Jakarta Annotations as its newer version and HK2 as its older version to allow dependant modules to resolve without us kicking off a chain of dependency upgrades Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Upgrades HK2 to the version aligned with EE11 APIs (4.0.0) with our patches reapplied as we need them for compilation.
Also introduces the EE11 shim to fudge the OSGi bundle version validation, allowing us to avoid having to do a "big bang" update of all the dependencies all at once.
The shim as introduced here has an upgrade shim for Annotations 2.1 to 3.0, as HK2 now requires Annotations 3.0 but the server is currently providing 2.1 (upgrading annotations would kick off a large dependency chain and will be tackled separately).
The shim also contains a downgrade shim for HK2 itself, as we're not upgrading Jersey at this moment (Jersey 3.1 still uses HK2 3.0) as it also kicks off a chain of dependency updates e.g. Grizzly. This shim also covers the HK2 requirement in InSights, which we will upgrade to a Payara 7 aligned version in a separate piece of work.
Important Info
Blockers
Requires release of HK2 p2: payara/patched-src-hk2#34
Requires the Javassist upgrade from #6630
Testing
New tests
None
Testing Performed
Built the server, started the admin console.
Testing Environment
Windows 11, Zulu Java 21.0.3
Documentation
N/A
Notes for Reviewers
None