Skip to content

Commit

Permalink
Updated reactor core, reactor netty and netty versions to latest (#13386
Browse files Browse the repository at this point in the history
)

* Updated reactor core to 3.3.8.RELEASE, reactor netty to 0.9.10.RELEASE and netty to 4.1.51.Final versions

* Updated tcnative and boring ssl versions in lieu of new netty versions

* Updated version that was skipped by pom file scanner

* Updated changelog for azure-core, azure-core-http-netty and azure-cosmos modules
  • Loading branch information
kushagraThapar committed Jul 23, 2020
1 parent a7fd6f2 commit 39ebd5a
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 58 deletions.
24 changes: 12 additions & 12 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ commons-codec:commons-codec;1.13
io.micrometer:micrometer-core;1.2.0
io.micrometer:micrometer-registry-azure-monitor;1.2.0
io.micrometer:micrometer-registry-graphite;1.2.0
io.netty:netty-buffer;4.1.49.Final
io.netty:netty-codec-http;4.1.49.Final
io.netty:netty-codec-http2;4.1.49.Final
io.netty:netty-handler;4.1.49.Final
io.netty:netty-handler-proxy;4.1.49.Final
io.netty:netty-tcnative;2.0.29.Final
io.netty:netty-tcnative-boringssl-static;2.0.29.Final
io.netty:netty-transport-native-epoll;4.1.49.Final
io.netty:netty-transport-native-unix-common;4.1.49.Final
io.netty:netty-transport-native-kqueue;4.1.49.Final
io.projectreactor.netty:reactor-netty;0.9.7.RELEASE
io.projectreactor:reactor-core;3.3.5.RELEASE
io.netty:netty-buffer;4.1.51.Final
io.netty:netty-codec-http;4.1.51.Final
io.netty:netty-codec-http2;4.1.51.Final
io.netty:netty-handler;4.1.51.Final
io.netty:netty-handler-proxy;4.1.51.Final
io.netty:netty-tcnative;2.0.31.Final
io.netty:netty-tcnative-boringssl-static;2.0.31.Final
io.netty:netty-transport-native-epoll;4.1.51.Final
io.netty:netty-transport-native-unix-common;4.1.51.Final
io.netty:netty-transport-native-kqueue;4.1.51.Final
io.projectreactor.netty:reactor-netty;0.9.10.RELEASE
io.projectreactor:reactor-core;3.3.8.RELEASE
io.reactivex:rxjava;1.2.4
javax.annotation:javax.annotation-api;1.3.2
javax.servlet:javax.servlet-api;4.0.1
Expand Down
5 changes: 4 additions & 1 deletion sdk/core/azure-core-http-netty/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# Release History

## 1.6.0-beta.1 (Unreleased)

- Updated reactor-core version to `3.3.8.RELEASE`
- Updated reactor-netty version to `0.9.10.RELEASE`
- Updated netty version to `4.1.51.Final`
- Updated netty-tcnative version to `2.0.31.Final`

## 1.5.3 (2020-07-02)

Expand Down
36 changes: 18 additions & 18 deletions sdk/core/azure-core-http-netty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,51 +66,51 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.49.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
<version>4.1.51.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.49.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
<version>4.1.51.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.49.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
<version>4.1.51.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.49.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
<version>4.1.51.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.49.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
<version>4.1.51.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.49.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.1.51.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.49.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<version>4.1.51.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.49.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<version>4.1.51.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<classifier>osx-x86_64</classifier>
</dependency>

<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty</artifactId>
<version>0.9.7.RELEASE</version> <!-- {x-version-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
<version>0.9.10.RELEASE</version> <!-- {x-version-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
</dependency>

<!-- test dependencies on azure-core, because we want to run tests inherited from this module using Netty -->
Expand Down Expand Up @@ -184,15 +184,15 @@
<rules>
<bannedDependencies>
<includes>
<include>io.netty:netty-buffer:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty:[0.9.7.RELEASE]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<include>io.netty:netty-buffer:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty:[0.9.10.RELEASE]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
4 changes: 4 additions & 0 deletions sdk/core/azure-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Release History

## 1.7.0-beta.2 (Unreleased)
- Updated reactor-core version to `3.3.8.RELEASE`
- Updated reactor-netty version to `0.9.10.RELEASE`
- Updated netty version to `4.1.51.Final`
- Updated netty-tcnative version to `2.0.31.Final`

## 1.7.0-beta.1 (2020-07-08)

Expand Down
8 changes: 4 additions & 4 deletions sdk/core/azure-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.3.5.RELEASE</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
<version>3.3.8.RELEASE</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
Expand All @@ -95,7 +95,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>2.0.29.Final</version> <!-- {x-version-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
<version>2.0.31.Final</version> <!-- {x-version-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -173,9 +173,9 @@
<rules>
<bannedDependencies>
<includes>
<include>io.netty:netty-tcnative-boringssl-static:[2.0.29.Final]
<include>io.netty:netty-tcnative-boringssl-static:[2.0.31.Final]
</include> <!-- {x-include-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.3.5.RELEASE]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.3.8.RELEASE]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.10.1]
</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.10.1]
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos-benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Licensed under the MIT License.
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative</artifactId>
<version>2.0.29.Final</version> {x-version-update;io.netty:netty-tcnative;external_dependency}
<version>2.0.31.Final</version> {x-version-update;io.netty:netty-tcnative;external_dependency}
<classifier>linux-x86_64</classifier>
</dependency>
-->
Expand Down
14 changes: 7 additions & 7 deletions sdk/cosmos/azure-cosmos-encryption/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,13 @@ Licensed under the MIT License.
<include>com.fasterxml.jackson.module:jackson-module-afterburner:[2.10.1]</include> <!-- {x-include-update;cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;external_dependency} -->
<include>io.dropwizard.metrics:metrics-core:[4.1.0]</include> <!-- {x-include-update;cosmos_io.dropwizard.metrics:metrics-core;external_dependency} -->
<include>io.micrometer:micrometer-core:[1.2.0]</include> <!-- {x-include-update;io.micrometer:micrometer-core;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.49.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.3.5.RELEASE]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty:[0.9.7.RELEASE]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.51.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.3.8.RELEASE]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty:[0.9.10.RELEASE]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
<include>org.slf4j:slf4j-api:[1.7.28]</include> <!-- {x-include-update;org.slf4j:slf4j-api;external_dependency} -->
<include>org.slf4j:slf4j-api:[1.7.28]</include> <!-- {x-include-update;org.slf4j:slf4j-api;external_dependency} -->
<include>org.bouncycastle:bcprov-jdk15on:[1.60]</include> <!-- {x-include-update;org.bouncycastle:bcprov-jdk15on;external_dependency} -->
Expand Down
7 changes: 6 additions & 1 deletion sdk/cosmos/azure-cosmos/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Release History

## 4.3.0-beta.1 (Unreleased)

### New Features
* Updated reactor-core version to `3.3.8.RELEASE`
* Updated reactor-netty version to `0.9.10.RELEASE`
* Updated netty version to `4.1.51.Final`
### Key Bug Fixes
* Fixed issue where SSLException gets thrown in case of cancellation of requests in GATEWAY mode.

## 4.2.0 (2020-07-14)
### New Features
Expand Down

0 comments on commit 39ebd5a

Please sign in to comment.