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

Regression in release-4.0 branch #1176

Merged
merged 4 commits into from
Oct 16, 2023
Merged

Conversation

NicoNes
Copy link
Contributor

@NicoNes NicoNes commented Aug 24, 2023

This PR is my proposal to fix multiple regressions introduced by the initial commit (ae1f6ef) on branch "release-4-0" (see issue #1165).

My fix is made of 2 commits:

  • First commit to rollback files where regression where spotted to their previous version from "master" branch.
  • Second commit to apply back only relevant changes from initial commit (ae1f6ef) on the files that I rollback in the first commit.

@spericas in your initial commit, you have massively replace all Context by Entity in javadoc in many classes (I listed them below). I do not revert these changes but I wonder if all of them are really relevant. If not antoher issue and PR will have to be opened to fix it.

  • jakarta.ws.rs.ext.Providers
  • jakarta.ws.rs.core.UriInfo
  • jakarta.ws.rs.core.SecurityContext
  • jakarta.ws.rs.core.Configuration
  • jakarta.ws.rs.core.HttpHeaders

-- Nicolas

@spericas
Copy link
Contributor

@NicoNes Thanks for looking into this. Generally looks good but let's drop changes that only update import orders, especially static ones. I believe the original 4.0 branch was created too early (before my large PR) and went stale.

@spericas
Copy link
Contributor

spericas commented Aug 30, 2023

@NicoNes Let's create another issue for the Context/Entity replacement problem you identified. You can assign it to me.

@NicoNes
Copy link
Contributor Author

NicoNes commented Aug 30, 2023

@NicoNes Thanks for looking into this. Generally looks good but let's drop changes that only update import orders, especially static ones. I believe the original 4.0 branch was created too early (before my large PR) and went stale.

@spericas Ok I will drop those changes.
I wasn't sure about what do to with those static import order changes because according to the GIT history, @mkarg commit (38772e3) about reorganizing the imports, moved these imports from down to top. So I believed your changes to move them back down again was not intentional.

@spericas
Copy link
Contributor

@NicoNes Thanks for looking into this. Generally looks good but let's drop changes that only update import orders, especially static ones. I believe the original 4.0 branch was created too early (before my large PR) and went stale.

@spericas Ok I will drop those changes. I wasn't sure about what do to with those static import order changes because according to the GIT history, @mkarg commit (38772e3) about reorganizing the imports, moved these imports from down to top. So I believed your changes to move them back down again was not intentional.

Sounds like we may need some consensus here. In any case, it probably shouldn't be part of this PR (or any PR not dealing specifically with that).

Copy link
Contributor

@spericas spericas left a comment

Choose a reason for hiding this comment

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

LGTM

@spericas
Copy link
Contributor

spericas commented Sep 7, 2023

@mkarg Could you review this one too?

@spericas spericas merged commit 7595659 into jakartaee:release-4.0 Oct 16, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants