-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Upgrade minimum JDK to 17 and migrate JavaX to Jakarta #17859
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
Open
HTHou
wants to merge
11
commits into
master
Choose a base branch
from
codex/jdk17-jakarta-migration
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
ca3df0a
Upgrade minimum JDK to 17 and migrate REST to Jakarta
HTHou f80618e
Apply Jakarta import ordering
HTHou 8a52f79
Fix integration-test import ordering
HTHou e1052bf
Fix REST JSON serialization in Jakarta migration
HTHou f590473
Fix REST v2 show query data types
HTHou 68f5e29
Keep JSR-305 nullness annotations
HTHou b2579ae
Fix REST OpenAPI JAXB dependency
HTHou 4191af0
Refresh PR mergeability
HTHou 07d75c2
Merge origin/master into JDK 17 Jakarta migration
HTHou ef58305
Merge origin/master into JDK 17 Jakarta migration
HTHou be178c3
Fix JDK 17 migration review feedback
HTHou File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,7 @@ pipeline { | |
|
|
||
| tools { | ||
| maven 'maven_3_latest' | ||
| jdk 'jdk_11_latest' | ||
| jdk 'jdk_17_latest' | ||
| } | ||
|
|
||
| options { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The REST fat jar now bundles additional Jakarta/OpenAPI dependencies that are not reflected here. For example,
mvn package -pl external-service-impl/rest-openapi,external-service-impl/rest -DskipTestsproducesrest-...-jar-with-dependencies.jarcontainingorg.eclipse.jetty:jetty-session:12.0.36, theio.swagger.core.v3:swagger-*-jakarta:2.2.50artifacts,io.github.classgraph:classgraph:4.8.184,com.fasterxml.jackson.jakarta.rs:*,jakarta.inject:jakarta.inject-api:2.0.1, andjakarta.xml.bind:jakarta.xml.bind-api:3.0.1.dependencies.jsonalready lists some of these, such asjetty-session, butLICENSE-binarystill omits them and still lists the oldjakarta.inject:jakarta.inject:2.6.1coordinate. Please regenerate/recheckLICENSE-binaryagainst the packaged external-service-impl artifact so the binary release license metadata matches what is actually bundled.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in be178c3.
LICENSE-binarynow includes the REST fat-jar additions:jetty-session, the Swagger Jakarta artifacts, Jackson Jakarta RS/XMLBind modules,classgraph,jakarta.inject-api,jakarta.activation-api, andjakarta.xml.bind-api; it also replaces the stalejakarta.inject:jakarta.inject:2.6.1coordinate withjakarta.inject:jakarta.inject-api:2.0.1.