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

Cherrypick Inject EntityManager changes from 8.0-JDK17 #25213

Merged
merged 12 commits into from
Nov 18, 2024

Conversation

arjantijms
Copy link
Contributor

The commits were initially done on the wrong branch

@arjantijms arjantijms added this to the 8.0.0 milestone Nov 17, 2024
@arjantijms arjantijms self-assigned this Nov 17, 2024
@OndroMih
Copy link
Contributor

Looks good. When compared with the 8.0-JDK17 branch, the differences are really only about Java version and some minor things that are not compatible with JDK17: https://github.com/eclipse-ee4j/glassfish/compare/8.0-JDK17..arjantijms:glassfish:8.0

There's one missing thing though - the default-web.xml file in the 8.0 branch has 11 for compilerSourceVM and compilerTargetVM JSP compiler params, while in the JDK17 branch it has 17.

@arjantijms , can you also change the JDK versions in the default-web.xml to 21 for the 8.0 branch, in this PR?

@arjantijms
Copy link
Contributor Author

There's one missing thing though

That's probably a "new" feature that wasn't introduced by the merge or the EntityManager changes, but just something we did in JDK 17 branch and never did in the regular branch. I'll change it though.

@dmatej dmatej merged commit 9190a3f into eclipse-ee4j:8.0 Nov 18, 2024
2 checks passed
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.

5 participants