Skip to content

Quic merge#15658

Merged
normanmaurer merged 12 commits into4.2from
quic_merge
Sep 15, 2025
Merged

Quic merge#15658
normanmaurer merged 12 commits into4.2from
quic_merge

Conversation

@normanmaurer
Copy link
Copy Markdown
Member

Motivation:

Explain here the context, and why you're making that change.
What is the problem you're trying to solve.

Modification:

Describe the modifications you've done.

Result:

Fixes #.

If there is no issue then describe the changes introduced by this PR.

normanmaurer and others added 12 commits August 14, 2025 19:51
Motivation:

BoringSSL returns GENERIC when using TLS1.3 but the JDK TrustManager
implementation expect UNKNOWN. We need to map it the expected value as
otherwise we will see failures.

Modifications:

Compare and adjust if needed

Result:

Correctly map auth method name
Motivation:

Quiche released a new version which also contains security fixes

Modifications:

Update to sha of 0.24.5

Result:

Depend on latest quiche version
Motivation:

We should use the latest released version

Modifications:

Update to latest version

Result:

Depend on the latest release
Motivation:

There are some problems when try to use the codec on android.

Modifications:
- fix android c++_shared not visible, because not linked
- Make QuicChannelBootstrap constructor public for compatibility with Android API <= 24

Result:

Be able to use on Android
Motivation:

We used an outdated version of netty

Modifications:

Update to latest version

Result:

Use latest netty version as dependency
Motivation:

It's been a while since we updated our used BoringSSL version.

Modifications:

Update to sha of current BoringSSL commit

Result:

Use latest BoringSSL version as of today
Motivation:

The android builds fail atm as cargo ndk segfaults. We need to figure
out why but until then let's disable the builds as otherwise PR
verification will fail

Modifications:

Skip android builds

Result:

PR verification works again
Motivation:

The used version of BoringSSL is ASL2

Modifications:

Update and so fix license informations for BoringSSL

Result:

Include correct license for BoringSSL
@normanmaurer normanmaurer merged commit 7c09fb8 into 4.2 Sep 15, 2025
33 of 34 checks passed
@normanmaurer normanmaurer deleted the quic_merge branch September 15, 2025 16:07
@normanmaurer normanmaurer added this to the 4.2.7.Final milestone Sep 15, 2025
dongjoon-hyun added a commit to apache/spark that referenced this pull request Dec 5, 2025
…` license

### What changes were proposed in this pull request?

This PR aims to update `NOTICE-binary` with `Netty` 4.2.7 license.
- https://github.com/netty/netty/blob/netty-4.2.7.Final/NOTICE.txt

### Why are the changes needed?

It seems that we updated `Netty Notice` at Apache Spark `3.0.0-preview` with `Netty 4.1.30.Final`.
- #25544

Since there are many changes like the following, we need to update it by simply copying and pasting.
- Netty 4.1.38.Final
  - netty/netty#9344
- Netty 4.1.44.Final
  - netty/netty#9161
- Netty 4.1.54.Final
  - netty/netty#10773
- Netty 4.1.66.Final
  - netty/netty#11256
  - netty/netty#11437
- Netty 4.1.108.Final
  - netty/netty#13864
- Netty 4.2.1.Final
  - netty/netty#14979
- Netty 4.2.7.Final
  - netty/netty#15658

Additionally, I also double-checked newly added transitive license through ASF [LEGAL-700](https://issues.apache.org/jira/browse/LEGAL-700). We are good to go.

- **Apple Public Source License 2.0**
  - https://spdx.org/licenses/APSL-2.0.html

### Does this PR introduce _any_ user-facing change?

No behavior change.

### How was this patch tested?

Manual review.

### Was this patch authored or co-authored using generative AI tooling?

No.

Closes #53335 from dongjoon-hyun/SPARK-54602.

Authored-by: Dongjoon Hyun <dongjoon@apache.org>
Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
dongjoon-hyun added a commit to apache/spark that referenced this pull request Dec 5, 2025
…` license

### What changes were proposed in this pull request?

This PR aims to update `NOTICE-binary` with `Netty` 4.2.7 license.
- https://github.com/netty/netty/blob/netty-4.2.7.Final/NOTICE.txt

### Why are the changes needed?

It seems that we updated `Netty Notice` at Apache Spark `3.0.0-preview` with `Netty 4.1.30.Final`.
- #25544

Since there are many changes like the following, we need to update it by simply copying and pasting.
- Netty 4.1.38.Final
  - netty/netty#9344
- Netty 4.1.44.Final
  - netty/netty#9161
- Netty 4.1.54.Final
  - netty/netty#10773
- Netty 4.1.66.Final
  - netty/netty#11256
  - netty/netty#11437
- Netty 4.1.108.Final
  - netty/netty#13864
- Netty 4.2.1.Final
  - netty/netty#14979
- Netty 4.2.7.Final
  - netty/netty#15658

Additionally, I also double-checked newly added transitive license through ASF [LEGAL-700](https://issues.apache.org/jira/browse/LEGAL-700). We are good to go.

- **Apple Public Source License 2.0**
  - https://spdx.org/licenses/APSL-2.0.html

### Does this PR introduce _any_ user-facing change?

No behavior change.

### How was this patch tested?

Manual review.

### Was this patch authored or co-authored using generative AI tooling?

No.

Closes #53335 from dongjoon-hyun/SPARK-54602.

Authored-by: Dongjoon Hyun <dongjoon@apache.org>
Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
(cherry picked from commit 191ce4c)
Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
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.

4 participants