Synced branch 6.x to master #23728
Merged
Synced branch 6.x to master #23728
Conversation
This file contains 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
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
Merge 6.2.3 branch into 6.x
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
Next version is 6.2.4-SNAPSHOT
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
Round 2 of basic cleaning for JTA code
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
Cleaning of code in the CLI optional package (mostly DB commands)
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
eclipse-ee4j#23722 Allow Derby to start on JDK 18
Ant on JDK 18 only supports fork mode, so added fork=true Signed-off-by: arjantijms <arjan.tijms@gmail.com>
eclipse-ee4j#23721 Fix ant not able to execute java tasks in JDK 18.
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
…_920 Integrate eclipselink.asm 9.2.0, for JDK 18 compatibility
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
eclipse-ee4j#23721 Fix ant not able to run java tasks on JDK 18 - web
# Conflicts - trivial # appserver/persistence/cmp/support-ejb/pom.xml # appserver/persistence/cmp/support-sqlstore/pom.xml
# Conflicts: trivial # appserver/transaction/jts/pom.xml
arjantijms
approved these changes
Dec 1, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
To avoid future conflicts and bring all new changes from 6.x branch to master too