You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ma...@apache.org on 2022/06/11 03:17:22 UTC

[pulsar] branch branch-2.9 updated: Upgrade Netty Reactive Streams to 2.0.6 (#15990)

This is an automated email from the ASF dual-hosted git repository.

mattisonchao pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.9 by this push:
     new 88c5681b219 Upgrade Netty Reactive Streams to 2.0.6 (#15990)
88c5681b219 is described below

commit 88c5681b219d26526b3b5c4c69897ed1fee8d35d
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Thu Jun 9 09:08:44 2022 +0800

    Upgrade Netty Reactive Streams to 2.0.6 (#15990)
    
    ### Motivation
    
    https://nvd.nist.gov/vuln/detail/CVE-2019-20444#range-6908693
    
    Upgrade from 2.0.4 to 2.0.6
    
    (cherry picked from commit 3d7634a06ff48f070a0bfce3925ccd30f1981cf6)
---
 distribution/server/src/assemble/LICENSE.bin.txt | 2 +-
 pom.xml                                          | 7 ++++++-
 pulsar-sql/presto-distribution/LICENSE           | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 5808df85c68..de9366b0336 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -332,7 +332,7 @@ The Apache Software License, Version 2.0
     - com.google.guava-failureaccess-1.0.1.jar
     - com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
  * J2ObjC Annotations -- com.google.j2objc-j2objc-annotations-1.3.jar
- * Netty Reactive Streams -- com.typesafe.netty-netty-reactive-streams-2.0.4.jar
+ * Netty Reactive Streams -- com.typesafe.netty-netty-reactive-streams-2.0.6.jar
  * Swagger
     - io.swagger-swagger-annotations-1.6.2.jar
     - io.swagger-swagger-core-1.6.2.jar
diff --git a/pom.xml b/pom.xml
index 06955be60d7..88db1eca8c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,7 +205,7 @@ flexible messaging model and an intuitive client API.</description>
     <spring-context.version>5.3.15</spring-context.version>
     <apache-http-client.version>4.5.13</apache-http-client.version>
     <seancfoley.ipaddress.version>5.3.3</seancfoley.ipaddress.version>
-
+    <netty-reactive-streams.version>2.0.6</netty-reactive-streams.version>
     <!-- test dependencies -->
     <cassandra.version>3.6.0</cassandra.version>
     <disruptor.version>3.4.0</disruptor.version>
@@ -1244,6 +1244,11 @@ flexible messaging model and an intuitive client API.</description>
         <version>${kotlin-stdlib.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>com.typesafe.netty</groupId>
+        <artifactId>netty-reactive-streams</artifactId>
+        <version>${netty-reactive-streams.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 411a7645fe4..d137a9a8098 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -241,7 +241,7 @@ The Apache Software License, Version 2.0
     - netty-handler-proxy-4.1.77.Final.jar
     - netty-common-4.1.77.Final.jar
     - netty-handler-4.1.77.Final.jar
-    - netty-reactive-streams-2.0.4.jar
+    - netty-reactive-streams-2.0.6.jar
     - netty-resolver-4.1.77.Final.jar
     - netty-resolver-dns-4.1.77.Final.jar
     - netty-tcnative-boringssl-static-2.0.52.Final.jar