Skip to content

Commit 291b949

Browse files
Upgrade Netty version from 4.1.68 to 4.1.72 (#2925)
Upgrade Netty version from 4.1.68 to 4.1.72
1 parent c0eb030 commit 291b949

File tree

6 files changed

+20
-7
lines changed

6 files changed

+20
-7
lines changed

.brazil.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"io.netty:netty-handler": { "packageName": "Netty4", "packageVersion": "4.1" },
103103
"io.netty:netty-resolver": { "packageName": "Netty4", "packageVersion": "4.1" },
104104
"io.netty:netty-transport": { "packageName": "Netty4", "packageVersion": "4.1" },
105-
"io.netty:netty-transport-native-epoll": { "packageName": "Netty4", "packageVersion": "4.1" },
105+
"io.netty:netty-transport-classes-epoll": { "packageName": "Netty4", "packageVersion": "4.1" },
106106
"io.netty:netty-transport-native-unix-common": { "packageName": "Netty4", "packageVersion": "4.1" },
107107
"org.apache.httpcomponents:httpclient": { "packageName": "Apache-HttpComponents-HttpClient", "packageVersion": "4.5.x" },
108108
"org.apache.httpcomponents:httpcore": { "packageName": "Apache-HttpComponents-HttpCore", "packageVersion": "4.4.x" },
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"category": "AWS SDK for Java v2",
3+
"contributor": "",
4+
"type": "feature",
5+
"description": "Upgrade Netty version to 4.1.72"
6+
}

bom-internal/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,8 @@
141141
</dependency>
142142
<dependency>
143143
<groupId>io.netty</groupId>
144-
<artifactId>netty-transport-native-epoll</artifactId>
144+
<artifactId>netty-transport-classes-epoll</artifactId>
145145
<version>${netty.version}</version>
146-
<classifier>linux-x86_64</classifier>
147146
</dependency>
148147
<dependency>
149148
<artifactId>org.eclipse.jdt.core</artifactId>

http-clients/netty-nio-client/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@
8383
</dependency>
8484
<dependency>
8585
<groupId>io.netty</groupId>
86-
<artifactId>netty-transport-native-epoll</artifactId>
87-
<classifier>linux-x86_64</classifier>
86+
<artifactId>netty-transport-classes-epoll</artifactId>
8887
</dependency>
8988

9089
<!--Reactive Dependencies-->

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ public void cancel() { }
108108
}
109109

110110
private static class CustomEmbeddedChannel extends EmbeddedChannel {
111+
112+
public volatile CustomEmbeddedEventLoop loop;
113+
111114
private CustomEmbeddedChannel() {
112115
super(false, false);
113116
}
@@ -116,6 +119,11 @@ private CustomEmbeddedChannel() {
116119
protected boolean isCompatible(EventLoop loop) {
117120
return loop instanceof CustomEmbeddedEventLoop;
118121
}
122+
123+
@Override
124+
public void runPendingTasks() {
125+
loop.runTasks();
126+
}
119127
}
120128

121129
private static class CustomEmbeddedEventLoop extends AbstractEventExecutor implements EventLoop {
@@ -186,6 +194,7 @@ public boolean awaitTermination(long timeout, TimeUnit unit) {
186194

187195
@Override
188196
public ChannelFuture register(Channel channel) {
197+
((CustomEmbeddedChannel) channel).loop = this;
189198
return register(new DefaultChannelPromise(channel, this));
190199
}
191200

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<equalsverifier.version>3.7.1</equalsverifier.version>
103103
<!-- Update netty-open-ssl-version accordingly whenever we update netty version-->
104104
<!-- https://github.com/netty/netty/blob/4.1/pom.xml search "tcnative.version" -->
105-
<netty.version>4.1.68.Final</netty.version>
105+
<netty.version>4.1.72.Final</netty.version>
106106
<unitils.version>3.4.6</unitils.version>
107107
<xmlunit.version>1.3</xmlunit.version>
108108
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -127,7 +127,7 @@
127127
<jimfs.version>1.1</jimfs.version>
128128
<testng.version>7.1.0</testng.version> <!-- TCK Tests -->
129129
<commons-lang.verson>2.6</commons-lang.verson>
130-
<netty-open-ssl-version>2.0.43.Final</netty-open-ssl-version>
130+
<netty-open-ssl-version>2.0.46.Final</netty-open-ssl-version>
131131
<dynamodb-local.version>1.16.0</dynamodb-local.version>
132132
<sqllite.version>1.0.392</sqllite.version>
133133
<blockhound.version>1.0.6.RELEASE</blockhound.version>

0 commit comments

Comments
 (0)