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

[Backport] [1.x] Update Netty to 4.1.117.Final (#17041) #17149

Merged
merged 1 commit into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- OpenJDK Update (July 2024 Patch releases) ([#15002](https://github.com/opensearch-project/OpenSearch/pull/15002))
- Bump `netty` from 4.1.109.Final to 4.1.114.Final ([#13802](https://github.com/opensearch-project/OpenSearch/pull/13802), [#14356](https://github.com/opensearch-project/OpenSearch/pull/14356), [#15081](https://github.com/opensearch-project/OpenSearch/pull/15081, https://github.com/opensearch-project/OpenSearch/pull/16182))
- Bump `icu4j` from 62.1 to 62.2 ([#15482](https://github.com/opensearch-project/OpenSearch/pull/15482))
- Bump `Netty` from 4.1.114.Final to 4.1.115.Final ([#16661](https://github.com/opensearch-project/OpenSearch/pull/16661))
- Bump `Netty` from 4.1.114.Final to 4.1.117.Final ([#16661](https://github.com/opensearch-project/OpenSearch/pull/16661), [#17041](https://github.com/opensearch-project/OpenSearch/pull/17041))

### Changed
### Deprecated
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ protobuf = 3.22.3
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 5.5.0

netty = 4.1.115.Final
netty = 4.1.117.Final
reactor_netty = 1.0.39
reactor = 3.4.34
joda = 2.12.2
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
022b4cc28194cb23671274499229e0ef35028fbd

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2831d3431ed93d9c0b64b1c0cce2ced4737539aa

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5a0f8cd908b8b09b2cd1d39c1d2086a4d12e6029

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9e074a4382f56b37f3b9ee1fc21d53e7af58ec9d

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
db14cd99515f8c98a3f2a347718e59f14d85c503

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
581b37489a03162f473264b65f53d504269a74b0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f81d72962bd134d8d8e11b514321134fa5fd0ce6

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
684f2316ff2b2171babbc17c95ac3bd97f5f091e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5023de39015bdc7a5740dcae109fb0a72160c207

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e0a678ac80e00b08a4c0118d496efabc4516ebbf

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c7e72e5ec8e349e15e2d38811696f6404e0a49e0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f032fb832d421d9906c705a1d328188723961c74

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
54c433e75a6e0f101ac78332a9958cd200ca2434

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
684f2316ff2b2171babbc17c95ac3bd97f5f091e
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@
import java.net.Authenticator;
import java.net.PasswordAuthentication;
import java.net.URISyntaxException;
import java.security.AccessController;
import java.security.InvalidKeyException;
import java.security.PrivilegedAction;
import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -397,7 +399,16 @@ private static class NioThreadFactory implements ThreadFactory {
}

public Thread newThread(Runnable r) {
final Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);
final Thread t = new Thread(group, new Runnable() {
@SuppressWarnings({ "deprecation", "removal" })
@Override
public void run() {
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
r.run();
return null;
});
}
}, namePrefix + threadNumber.getAndIncrement(), 0);

if (t.isDaemon()) {
t.setDaemon(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ grant {
permission java.lang.RuntimePermission "accessDeclaredMembers";
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
permission java.lang.RuntimePermission "setContextClassLoader";
permission java.lang.RuntimePermission "getClassLoader";

// azure client set Authenticator for proxy username/password
permission java.net.NetPermission "setDefaultAuthenticator";
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
61dfea8203f3b653e79959bc259adf848b998d8c

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
022b4cc28194cb23671274499229e0ef35028fbd

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2831d3431ed93d9c0b64b1c0cce2ced4737539aa

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5a0f8cd908b8b09b2cd1d39c1d2086a4d12e6029

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9e074a4382f56b37f3b9ee1fc21d53e7af58ec9d

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
db14cd99515f8c98a3f2a347718e59f14d85c503

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
581b37489a03162f473264b65f53d504269a74b0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f81d72962bd134d8d8e11b514321134fa5fd0ce6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
022b4cc28194cb23671274499229e0ef35028fbd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2831d3431ed93d9c0b64b1c0cce2ced4737539aa
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5023de39015bdc7a5740dcae109fb0a72160c207
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5a0f8cd908b8b09b2cd1d39c1d2086a4d12e6029
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e0a678ac80e00b08a4c0118d496efabc4516ebbf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9e074a4382f56b37f3b9ee1fc21d53e7af58ec9d
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
db14cd99515f8c98a3f2a347718e59f14d85c503
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
581b37489a03162f473264b65f53d504269a74b0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
54c433e75a6e0f101ac78332a9958cd200ca2434
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f81d72962bd134d8d8e11b514321134fa5fd0ce6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
684f2316ff2b2171babbc17c95ac3bd97f5f091e
Loading