-
Notifications
You must be signed in to change notification settings - Fork 123
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
fast track: Update main with missing commits #1225
Conversation
So if master becomes the new 4.0 for EE11, isn't it confusing to have a 3.2 branch? I know that it is experimental, but seems a bit odd for its number to be lower. Maybe I'm missing something. |
TBH I completely agree. I'm just not sure what to do. The master branch is out of date. The release-4.0 branch can't really become master unless we revert some things like removing the the Both master, release-3.2 and release-4.0 include #1066 so we need some kind of version bump in master. If we remove the XML Binding dependency, then it needs to be a major bump. In the end this seemed like the best middle ground. There really should be another commit on top of this, which I can add, that updates the signature test file too because it is missing the singantures from #1066 and the signature change from #863. IMO none of the branches are in a releasable state. I will go ahead and add the commit to update the signature files to this PR too. I think that is critical too. Whether we go with this PR or not is fine, but IMO we do need some branch in a releasable state. |
I've added the additional commit to update the signature test plugin and file. Please note this is just my opinion on what would get the branch where we need it. I wanted to propose it so we could have a path forward. Given, AIUI, this would take at least two weeks to get merged, that leaves with about two more weeks to get anything else done for Jakarta EE 11. We're due to have something by 29.Mar.2024, unless the schedule gets pushed. |
fef38c3
to
0791d6b
Compare
I've added "fast track" to the title. Since the changes in this PR have all been reviewed and approved in other PRs it seems logical to allow this to be fast tracked. |
I can rename the "release-3.2" branch to "release-4.1" to remove confusion. If for some reason the EE11 schedule gets pushed out and the group feels comfortable with the content in the release-4.1 branch, I'm assuming we could apply it to 4.0. |
0791d6b
to
f251ca5
Compare
jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/sig-test.map
Show resolved
Hide resolved
28d2d9f
to
d553f79
Compare
For ease of review I've done the copyright date updates in a separate commit. If preferred, I could do the updates within the correct commit the file was changed in. |
2da825a
to
d553f79
Compare
Signed-off-by: James R. Perkins <[email protected]>
…ins to avoid repetition. Signed-off-by: James R. Perkins <[email protected]>
actions used. Signed-off-by: James R. Perkins <[email protected]>
…le to match the current signatures. Signed-off-by: James R. Perkins <[email protected]>
Signed-off-by: James R. Perkins <[email protected]>
d553f79
to
954c314
Compare
Merging |
This PR is comprised of several commits that are in the release-3.2 and release-4.0 branches that should likely be in master. It also takes the liberty of change the master branches version from 3.1.0 to 4.0.0-SNAPSHOT. This was primarily done to prepare for a slimmed down 4.0.0 for Jakarta EE 11 as described in https://www.eclipse.org/lists/rest-dev/msg00231.html
Associated PR's that comprised this PR:
Just for a reference too, this PR includes the following commits from release-4.0: