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

Upgrade to JakartaEE 10 API for compatibility with Payara 6 #138

Merged
merged 14 commits into from
Aug 14, 2023
Merged

Conversation

ajkyffin
Copy link
Contributor

@ajkyffin ajkyffin commented Aug 7, 2023

The key changes in this PR are:

  • Imports of JavaEE classes in the javax namespace are changed to the jakarta namespace.
  • The Java version in increases to Java 11 since this is the minimum supported by JakartaEE.
  • The dependency on commons-fileupload is removed since there is no version compatible with the jakarta namespace. The native multipart handling in the Servlet API is used instead.

The first 2 changes are not backwards-compatible so this is a new major version.

@ajkyffin
Copy link
Contributor Author

ajkyffin commented Aug 7, 2023

I've made changes to icat-ansible and manually re-run the CI which is now succeeding: https://github.com/icatproject/ids.server/actions/runs/5786590806

@ajkyffin ajkyffin requested a review from RKrahl August 7, 2023 15:16
 - update OS to Ubuntu 22.04
 - use OS python version
 - add Java 17 to version matrix
 - run apt-get update
 - remove installation of python3-lxml which is now done by icat-ansible
Copy link
Member

@RKrahl RKrahl left a comment

Choose a reason for hiding this comment

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

Looks good to me. The one comment in the code is just meant to set a reminder.

There is one issue with Miredot failing to create the REST API documentation. It seems to be the same issue as in icatproject/icat.server#310. I get the error message:

[INFO] --- miredot-plugin:2.4.1-Java11:restdoc (miredot) @ ids.server ---
[WARNING] Rest Framework not explicitly set, using JAX-RS by default.
[INFO] Building reflective model of API and reading annotations...
[ERROR] Your project doesn't contain any REST interfaces, so no output will be generated.
Maybe it is incorrectly configured.

But I'd prefer to deal with that in a separate issue after merging this PR.

@ajkyffin: you were still adding commits recently. Are you done with this?

# ICAT Ansible clone and install dependencies
- name: Checkout icat-ansible
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
with:
repository: icatproject-contrib/icat-ansible
path: icat-ansible
ref: master
ref: payara6
Copy link
Member

Choose a reason for hiding this comment

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

I guess that will need to be changed back to master as soon as icatproject-contrib/icat-ansible#84 gets merged.

@RKrahl RKrahl added the compatibility Issues about compatibility with libraries or other packages label Aug 11, 2023
@RKrahl RKrahl added this to the 2.0.0 milestone Aug 11, 2023
@RKrahl RKrahl merged commit 414f8f0 into master Aug 14, 2023
@RKrahl RKrahl deleted the payara6 branch August 14, 2023 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compatibility Issues about compatibility with libraries or other packages
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants