Skip to content
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-786: Support both MP 3.3. and 4.0+ in OSGi #115

Merged
merged 3 commits into from
Jun 29, 2021

Conversation

OndroMih
Copy link
Contributor

Don't export MP packages. Allow to import MP Config
from version 1.4 (MP 3.3) to 2.0+ (MP 4.0+)

This is needed to integrate to the latest Payara Enterprise.

Don't export MP packages. Allow to import MP Config 
from version 1.4 (MP 3.3) to 2.0+ (MP 4.0+)
This is needed to integrate to the latest Payara Enterprise
openid/pom.xml Outdated
Comment on lines 134 to 135
*;resolution:=optional, org.eclipse.microprofile.config;v
ersion="[1.0,3)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, the end of the line was too heavy and it dropped ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed that. I'll these on the same line.

oauth2/pom.xml Outdated
Comment on lines 94 to 104
<Import-Package>
!org.eclipse.microprofile.*,
org.eclipse.microprofile.config;version="[1.0,3)",
*
</Import-Package>
<Export-Package>
!org.eclipse.microprofile.*,
fish.payara.security.oauth2.*
</Export-Package>
</instructions>
<excludeDependencies>microprofile,microprofile-config-api</excludeDependencies>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are all of these necessary? In theory only * and the rule for config package should be necessary, and only for imports.
Exports and excludeDependencies are not needed (I didn't try though).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. In the end it's enough to place the config package in import before the microprofile and * imports. When I added it to the end of the list, it was being ignored because the packages were handled by the previous rules.

@pdudits pdudits merged commit 6f6a993 into payara:master Jun 29, 2021
@OndroMih OndroMih deleted the fish-786-enterprise branch June 29, 2021 14:20
@jGauravGupta jGauravGupta added this to the 2.1.0 milestone Jul 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants