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

[WFLY-17673] Replace javax API module identifiers in DUPs with the ja… #16691

Merged
merged 1 commit into from Apr 5, 2023

Conversation

yersan
Copy link
Contributor

@yersan yersan commented Apr 5, 2023

…karta variant name

Jira issue: https://issues.redhat.com/browse/WFLY-17673

@@ -46,7 +46,7 @@ public class EeSubsystemRootResource extends SimpleResourceDefinition {

public static final String WILDFLY_NAMING = "org.wildfly.naming";
public static final String JBOSS_INVOCATION = "org.jboss.invocation";
public static final String JSON_API = "javax.json.api";
public static final String JSON_API = "jakarta.json.api";
public static final String GLASSFISH_EL = "org.glassfish.javax.el";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

org.glassfish.javax.el is an alias of org.glassfish.jakarta.el which is indeed an alias for org.glassfish.expressly, but we are taking into account a limited set of aliases to avoid incompatibilities via exclusions, so I intentionally left it as it is.

Comment on lines 55 to 57
public static final ModuleIdentifier JAXB_API = ModuleIdentifier.create("jakarta.xml.bind.api");
public static final ModuleIdentifier JSON_API = ModuleIdentifier.create("jakarta.json.api");
public static final ModuleIdentifier JAXRS_API = ModuleIdentifier.create("jakarta.ws.rs.api");
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Since these fields are public, I left them as they are without converting them to Strings

Copy link
Contributor

Choose a reason for hiding this comment

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

Is the module public or private?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good hint, the module is private, so, we are able to modify these fields without worrying about public usage

@github-actions github-actions bot added the deps-ok Dependencies have been checked, and there are no significant changes label Apr 5, 2023
@yersan yersan marked this pull request as draft April 5, 2023 11:24
Comment on lines -47 to -49
ModuleIdentifier.create("javax.jws.api"),
ModuleIdentifier.create("javax.xml.soap.api"),
ModuleIdentifier.create("javax.xml.ws.api")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

javax.jws.api and javax.xml.ws.api are two aliases of jakarta.xml.ws.api

@yersan yersan marked this pull request as ready for review April 5, 2023 11:39
@yersan yersan marked this pull request as draft April 5, 2023 13:29
@yersan yersan marked this pull request as ready for review April 5, 2023 15:38
@bstansberry bstansberry merged commit c7ca268 into wildfly:main Apr 5, 2023
14 checks passed
@bstansberry
Copy link
Contributor

Thanks @yersan

@yersan yersan deleted the WFLY-17673 branch April 6, 2023 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deps-ok Dependencies have been checked, and there are no significant changes
Projects
None yet
3 participants