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.

Sign up for GitHub

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

Jump to bottom

Add Jakarta EE/Java EE support for Tomcat and TomEE #4822

Merged
merged 14 commits into from
Jan 11, 2023
Merged

Add Jakarta EE/Java EE support for Tomcat and TomEE #4822

merged 14 commits into from
Jan 11, 2023

Conversation

pepness
Copy link
Member

@pepness pepness commented Oct 20, 2022 •
edited
Loading

  • Add identifiers for Tomcat 10 and 10.1
  • Add support for TomEE versions from 1.5 to 9
  • Improve support for TomEE types and correctly identify them. (Microprofile, Webprofile, etc.)
  • Improve Tomcat/TomEE version enum
  • Improve Tomcat/TomEE jvm platform support
  • Fix the default jvm platform that is pre-selected for Tomcat/TomEE
  • Improve logic for supported profiles and jvm platforms for Tomcat and TomEE
  • Improve logic for getJavadoc() method for Tomcat and TomEE
  • Add missing tomcat versions to some methods
  • Add isAtLeast() method to TomcatVersion
  • Use enum isAtLeast() method to improve logic
  • Improve support for Jakarta EE JaxRS
  • Add Tests for new TomEEtype logic
  • Add Tests for new Tomcat version comparison
  • Add Tests for new TomEE version comparison
  • Use generics
  • Bump javac.source to 1.8
  • Add missing attributes to a dtd file

Testing:

  • Full build done
  • Verify successful execution of libraries and licenses Ant test
  • Verify successful execution of Sigtests
  • Started NetBeans and ensure the log didn't have any ERROR or new WARNINGS
  • Download every version of Tomcat and TomEE and successfully:
    • Register it
    • Check correct Java SE support from Java 6 to Java 20
    • Check correct Java/Jakarta EE support from JEE 5 to JakartaEE 9.1
    • Create Web App Project
    • Deploy and run a servlet

Tomcat 9 and TomEE 8 support up to Jakarta EE 8
1
TomEE 9 support only Jakarta EE 9.1
PR-4822-3
Tomcat 10.1 support only Jakarta EE 10
PR-4822-5
Partial support for Tomcat 11 with Jakarta EE 10
PR-4822-6

@pepness pepness added the Java EE/Jakarta EE [ci] enable enterprise job label Oct 20, 2022
@pepness pepness added this to the NB16 milestone Oct 20, 2022
@pepness pepness self-assigned this Oct 20, 2022
@neilcsmith-net neilcsmith-net modified the milestones: NB16, NB17 Oct 21, 2022
@neilcsmith-net
Copy link
Member

neilcsmith-net commented Oct 21, 2022 •
edited
Loading

@pepness NB16 has already branched. If you think there's an argument for including, will need rebasing on delivery and to be reviewed with release criteria in mind, as well as possibly the issue queue as there's a bunch of things reported in this area in 16-rc1.

@pepness pepness added work-in-progress do not merge Don't merge this PR, it is not ready or just demonstration purposes. labels Oct 22, 2022
@pepness
Copy link
Member Author

pepness commented Oct 22, 2022

@neilcsmith-net my mistake, let's wait for NB 17 while I keep working on it.

@pepness pepness added enterprise [ci] enable enterprise job and removed work-in-progress do not merge Don't merge this PR, it is not ready or just demonstration purposes. labels Nov 3, 2022
mbien
mbien reviewed Dec 8, 2022
View reviewed changes
Copy link
Member

@mbien mbien left a comment

Choose a reason for hiding this comment

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

awesome - looks good overall, left two comments.

@mbien
Copy link
Member

mbien commented Jan 7, 2023

@pepness would be great to get this in for NB 17. Would be good to extract that one method and change the tests a bit, shouldn't take much time hopefully.

@pepness
Copy link
Member Author

pepness commented Jan 7, 2023

@mbien I already did the changes you suggested and added initial support for Tomcat 11, just re-testing everything. Hopefully by tomorrow I will finish.

@mbien
Copy link
Member

mbien commented Jan 8, 2023

@pepness awesome! no need to hurry, feature freeze is on the 17th.

pepness added 11 commits January 9, 2023 13:54
@pepness
- Add identifiers for Tomcat 10 and 10.1
1dd39f1 
- Improve support for TomEE types and correctly identify them.
- Add support for TomEE versions from 1.5 to 9
- Improve logic for supported profiles and jvm platforms
  for Tomcat and TomEE
- Improve logic for getJavadoc() method
@pepness
- Add missing tomcat versions to some methods
ba85a90 
- Improve Tomcat/TomEE version enum
  - Add isAtLeast() method
- Use enum isAtLeast() method to improve logic
- Improve support for Jakarta EE JaxRS
@pepness
- Add Tests for new TomEEtype logic
c38a29d 
- Add Tests for new Tomcat version comparison
- Add Tests for new TomEE version comparison
@pepness
- Use generics
8ea7612 
- Use StandardCharsets
- Use try-with-resources
- Add @OverRide tags
- Bump javac.source to 1.8
- Add missing attributes to a dtd file
@pepness
- Improve Tomcat/TomEE jvm platform support
fac0aed 
- Fix the default jvm platform that is pre-selected
@pepness
-Move call of isTomEEJaxRS(), should be called only if isTomEE() is true
31dd93c 
-Remove redundant call to loadTomEEInfo(), isTomEE() will call it before
@pepness
-Use Utilities method to convert URIs
571659e 
-Add missing validation for Tomcat 5.0
-tomcat-coyote.jar location is different for tomcat 5.0 and 5.5
@pepness
Add new helper method versionRange and use it to define valid ranges of
e5bc70c 
supported java versions. Thanks to Michael Bien.
@pepness
Make tomee patterns package private and use them in tests. They are used
8ba213e 
only in this module.
@pepness
Add initial support for Tomcat 11
67e0caa
@pepness
Add logging (Revert before merging)
2a30cf7
@pepness pepness force-pushed the tomcat-jakarta-v2 branch from 6ec30d0 to 2a30cf7 Compare January 9, 2023 19:55
mbien
mbien approved these changes Jan 10, 2023
View reviewed changes
Copy link
Member

@mbien mbien 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. Thanks for updating this.

I left some comments while looking though it again but feel free to ignore them.

@mbien
Copy link
Member

mbien commented Jan 11, 2023

don't forget to squash as you see fit and lets get this in

@pepness pepness merged commit 69fbded into apache:master Jan 11, 2023
neilcsmith-net pushed a commit to neilcsmith-net/netbeans that referenced this pull request Jan 11, 2023
@pepness @neilcsmith-net
Add Jakarta EE/Java EE support for Tomcat and TomEE (apache#4822)
6227036 
- Add support for Tomcat 10 and 10.1
- Improve support for Tomcat versions from 5 to 10.1
- Add initial support for Tomcat 11
- Add support for TomEE versions from 1.5 to 9
- Improve support for TomEE types and correctly identify them.
- Improve logic for supported profiles and jvm platforms for Tomcat and TomEE
- Add new helper method versionRange and use it to define valid ranges of supported java versions. Kudos to Michael Bien.
- Improve logic for getJavadoc() method
- Improve Tomcat/TomEE version enum
- Improve support for Jakarta EE JaxRS
- Fix the default jvm platform that is pre-selected
- Move call of isTomEEJaxRS(), should be called only if isTomEE() is true
- Remove redundant call to loadTomEEInfo(), isTomEE() was calling it already
- Add missing validation for Tomcat 5.0
- tomcat-coyote.jar location is different for tomcat 5.0 and 5.5
- Add Tests for new TomEEtype logic
- Add Tests for new Tomcat version comparison
- Add Tests for new TomEE version comparison
- Use generics
- Use StandardCharsets
- Use try-with-resources
- Add @OverRide tags
- Bump javac.source to 1.8
- Add missing attributes to a dtd file
This was referenced Jan 21, 2023
Closed
Closed
@pepness pepness mentioned this pull request Mar 4, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mbien mbien mbien approved these changes

Assignees

@pepness pepness

Labels
enterprise [ci] enable enterprise job Java EE/Jakarta EE [ci] enable enterprise job
Projects
None yet
Milestone
NB17
Development

Successfully merging this pull request may close these issues.
3 participants
@pepness @neilcsmith-net @mbien