Skip to content

Commit

Permalink
Updating Netty and Reactor Netty Dependencies (#37202)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jairmyree
jairmyree committed Oct 16, 2023
1 parent d4512b2 commit 9e1c6d5
Show file tree
Hide file tree
Showing 11 changed files with 75 additions and 75 deletions.
2 changes: 1 addition & 1 deletion common/perf-test-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<!-- Special allowance for performance libraries as they aren't shipped. -->
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->

<include>io.projectreactor:reactor-core:[3.4.32]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.33]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
32 changes: 16 additions & 16 deletions eng/versioning/external_dependencies.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,22 @@ io.fabric8:kubernetes-client;5.12.3
io.micrometer:micrometer-core;1.9.15
io.micrometer:micrometer-registry-azure-monitor;1.9.15
io.micrometer:micrometer-registry-graphite;1.9.15
io.netty:netty-buffer;4.1.97.Final
io.netty:netty-common;4.1.97.Final
io.netty:netty-codec;4.1.97.Final
io.netty:netty-codec-http;4.1.97.Final
io.netty:netty-codec-http2;4.1.97.Final
io.netty:netty-transport;4.1.97.Final
io.netty:netty-handler;4.1.97.Final
io.netty:netty-handler-proxy;4.1.97.Final
io.netty:netty-tcnative;2.0.61.Final
io.netty:netty-tcnative-boringssl-static;2.0.61.Final
io.netty:netty-transport-native-epoll;4.1.97.Final
io.netty:netty-transport-native-unix-common;4.1.97.Final
io.netty:netty-transport-native-kqueue;4.1.97.Final
io.projectreactor.netty:reactor-netty;1.0.36
io.projectreactor.netty:reactor-netty-http;1.0.36
io.projectreactor:reactor-core;3.4.32
io.netty:netty-buffer;4.1.100.Final
io.netty:netty-common;4.1.100.Final
io.netty:netty-codec;4.1.100.Final
io.netty:netty-codec-http;4.1.100.Final
io.netty:netty-codec-http2;4.1.100.Final
io.netty:netty-transport;4.1.100.Final
io.netty:netty-handler;4.1.100.Final
io.netty:netty-handler-proxy;4.1.100.Final
io.netty:netty-tcnative;2.0.62.Final
io.netty:netty-tcnative-boringssl-static;2.0.62.Final
io.netty:netty-transport-native-epoll;4.1.100.Final
io.netty:netty-transport-native-unix-common;4.1.100.Final
io.netty:netty-transport-native-kqueue;4.1.100.Final
io.projectreactor.netty:reactor-netty;1.0.38
io.projectreactor.netty:reactor-netty-http;1.0.38
io.projectreactor:reactor-core;3.4.33
io.vertx:vertx-codegen;4.4.4
io.vertx:vertx-core;4.4.4
jakarta.validation:jakarta.validation-api;2.0.2
Expand Down
32 changes: 16 additions & 16 deletions sdk/aot/azure-aot-graalvm-support-netty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,44 +66,44 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<classifier>osx-x86_64</classifier>
</dependency>
</dependencies>
Expand All @@ -118,14 +118,14 @@
<rules>
<bannedDependencies>
<includes>
<include>io.netty:netty-buffer:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<include>io.netty:netty-buffer:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
48 changes: 24 additions & 24 deletions sdk/core/azure-core-http-netty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,69 +78,69 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-codec;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-codec;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<classifier>osx-x86_64</classifier>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>2.0.61.Final</version> <!-- {x-version-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
<version>2.0.62.Final</version> <!-- {x-version-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
<classifier>${boring-ssl-classifier}</classifier>
</dependency>

<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<version>1.0.36</version> <!-- {x-version-update;io.projectreactor.netty:reactor-netty-http;external_dependency} -->
<version>1.0.38</version> <!-- {x-version-update;io.projectreactor.netty:reactor-netty-http;external_dependency} -->
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-common;external_dependency} -->
<version>4.1.100.Final</version> <!-- {x-version-update;io.netty:netty-common;external_dependency} -->
</dependency>
<!-- test dependencies on azure-core, because we want to run tests inherited from this module using Netty -->
<dependency>
Expand Down Expand Up @@ -207,18 +207,18 @@
<rules>
<bannedDependencies>
<includes>
<include>io.netty:netty-tcnative-boringssl-static:[2.0.61.Final]</include> <!-- {x-include-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty-http:[1.0.36]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty-http;external_dependency} -->
<include>io.netty:netty-buffer:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-common:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-common;external_dependency} -->
<include>io.netty:netty-codec:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-codec;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<include>io.netty:netty-tcnative-boringssl-static:[2.0.62.Final]</include> <!-- {x-include-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty-http:[1.0.38]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty-http;external_dependency} -->
<include>io.netty:netty-buffer:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-common:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-common;external_dependency} -->
<include>io.netty:netty-codec:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-codec;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.100.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<version>1.0.36</version> <!-- {x-version-update;io.projectreactor.netty:reactor-netty-http;external_dependency} -->
<version>1.0.38</version> <!-- {x-version-update;io.projectreactor.netty:reactor-netty-http;external_dependency} -->
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -154,7 +154,7 @@
<includes>
<include>io.projectreactor:reactor-test:[3.4.32]</include> <!-- {x-include-update;io.projectreactor:reactor-test;external_dependency} -->
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty-http:[1.0.36]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty-http;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty-http:[1.0.38]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty-http;external_dependency} -->
<!-- special allowance for azure-core-test as it is not a shipping library: -->
<include>org.junit.jupiter:junit-jupiter-api:[5.9.3]</include> <!-- {x-include-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
<include>org.junit.jupiter:junit-jupiter-params:[5.9.3]</include> <!-- {x-include-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
Expand Down
Loading

1 comment on commit 9e1c6d5

@gcpdev
Copy link

@gcpdev gcpdev commented on 9e1c6d5 Oct 17, 2023

Choose a reason for hiding this comment

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

This commit includes such a high vulnerability update. Any ideas when a new version of Azure Core will bundle those changes?

Please sign in to comment.