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

merge of the current master into jakartified branch #4666

Closed
wants to merge 12 commits into from

Conversation

senivam
Copy link
Contributor

@senivam senivam commented Dec 22, 2020

No description provided.

spericas and others added 12 commits November 30, 2020 12:18
…the Client API. If the property jersey.config.client.ignoreExceptionResponse is set to true, any response in an exception thrown by the Client API will be mapped to an empty response that only includes the status code of the original one. This is to prevent accidental leaks of confidential data.

Signed-off-by: Santiago Pericasgeertsen <[email protected]>
* Make JAX-B API optional

Signed-off-by: Jan Supol <[email protected]>
* Added ssl configuration support for JerseyTest

Signed-off-by: Hakan Altindag <[email protected]>
…nitialization in JDK (eclipse-ee4j#4566)

* Avoid unsafe lazy-initialization for SSL sockets

This prevents calling HttpsURLConnection.getDefaultSSLSocketFactory() in
an unsafe manner due to the poorly implemented lazy-initialization on
the JDK.

When multiple threads call that method concurrently (calling
secureConnection()) the SSLSocketFactory is instantiated two times,
making one thread fail the check and overriding the custom socket
factory with the default one.

Also-by: Kevin Conaway <[email protected]>
Signed-off-by: Adrian Haasler García <[email protected]>
Technical merge of released branch 2.33-BRANCH
Signed-off-by: Maxim Nesen <[email protected]>
@senivam
Copy link
Contributor Author

senivam commented Dec 22, 2020

In this PR only bots have no ECA signed, which shall be OK for review.

@senivam senivam requested a review from jansupol December 22, 2020 09:25
Copy link
Contributor

@jansupol jansupol left a comment

Choose a reason for hiding this comment

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

How come the files bundles/jaxrs-ri/pom.xml and connectors/jetty-connector/pom.xml are not in the merge request?

<Import-Package>${javax.annotation.osgi.version},*</Import-Package>
<Import-Package>
${javax.annotation.osgi.version},
<!-- compatibility with GF 5.1 -->
Copy link
Contributor

Choose a reason for hiding this comment

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

This PR/file is Jersey 2.x specific. It would break 3.x in GF 6

@senivam
Copy link
Contributor Author

senivam commented Jan 6, 2021

closed in favor of #4674

@senivam senivam closed this Jan 6, 2021
@senivam senivam deleted the 3.x_merged branch January 7, 2021 08:49
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.

6 participants