-
Notifications
You must be signed in to change notification settings - Fork 307
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FISH-7048 FISH-7253 FISH-7254 FISH-7255 FISH-8219 FISH-8220 Upgrade OSGi #6546
Merged
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
Pandrex247
force-pushed
the
Upgrade-OSGi
branch
3 times, most recently
from
February 6, 2024 17:20
b0f6cd2
to
440cde5
Compare
Pandrex247
changed the title
FISH-7048 FISH-7253 FISH-7254 FISH-7255 FISH-8220 Upgrade OSGi
FISH-7048 FISH-7253 FISH-7254 FISH-7255 FISH-8219 FISH-8220 Upgrade OSGi
Feb 6, 2024
Pandrex247
force-pushed
the
Upgrade-OSGi
branch
3 times, most recently
from
February 12, 2024 14:04
0b4a8f9
to
586937b
Compare
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
…ropriately Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
…Function" This reverts commit b23977a.
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Also pulls in org.osgi.service.component as it's now required Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Also introduces additional logging and logger variable. Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Pandrex247
force-pushed
the
Upgrade-OSGi
branch
from
February 13, 2024 15:17
586937b
to
5b4be02
Compare
Make sure the type is set also for jdk classes.
aubi
approved these changes
Feb 27, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
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 OSGi and its related Felix components.
Does a small amount of cleanup with the osgi.properties files. I converted those that I needed to touch into Maven config, but I elected not to nuke all of them as it would be a) time-consuming and b) make this PR huge.
I've elected to leave the stuff for Knopflerfish and Equinox in for now, though this is a similar thing which we may wish to clean up at some point.
The properties I've removed are resolved and provided by Felix.
The
org.osgi.framework.system.packages.extra
property is now resolved programmatically by reading thesimple-glassfish-api.jar
manifest - this module contains the bootstrap APIs.Also makes a change to the
OpenAPISupplier
class to deal with the duplicate type conflicts that come about from this change: now that Felix is exporting JDK classes, it detects them while doing parsing (see here). Without this change classes such asEnum
are not detected while parsing - they are now. Payara 5 apparently always had some conflict resolution where it would simply use the first found which I've ported across and added some logging to - it Shouldn't™ come up as I filter out classes which aren't a part of the application itself, but it's there as a safety net.This possibly slows down parsing as it's now able to resolve these classes and therefore potentially parses more "transitively" - I'd need to do some performance testing to confirm. To be clear, the
Enum
class will always be detected while parsing, but what may have changed now is that anything defined within theEnum
class itself may also now be parsed.I have a follow-up PR which updates Felix & OSGi in HK2 here.
Important Info
Blockers
None
Testing
New tests
None
Testing Performed
Started Payara Server and loaded the admin console.
Started Payara Micro and deployed an application.
Started Payara Embedded and deployed an application.
Additionally started Payara Server and loaded the admin console on Java 17, and 21.
Ran the MicroProfile OpenAPI TCK on JDK 11 and 21.
Testing Environment
Windows 11, Java 11.0.22, 17.0.10, 21.0.2
Documentation
N/A
Notes for Reviewers
MainHelper
class.UberJarOSGiGlassFishRuntimeBuilder
is actually to dead code - this isn't used anywhere. It's for a distribution of embedded that we've never published.