You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2022/12/13 08:29:15 UTC
[pulsar] branch branch-2.10 updated (ca001b3be8f -> 3cace2f546d)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a change to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from ca001b3be8f [cherry-pick][branch-2.10] Check numMessages after incrementing counter and NPE cause (#18885)
new 0c9e8ea107d [improve][build] Remove versions that are handled by netty-bom (#18629)
new 3cace2f546d [improve][misc] Upgrade Netty to 4.1.86.Final and Netty Tcnative to 2.0.54.Final (#18599)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
buildtools/pom.xml | 2 +-
distribution/server/src/assemble/LICENSE.bin.txt | 50 +++++++++++-----------
pom.xml | 15 +------
.../apache/pulsar/broker/service/ServerCnx.java | 2 -
pulsar-sql/presto-distribution/LICENSE | 48 ++++++++++-----------
src/owasp-dependency-check-false-positives.xml | 2 +-
6 files changed, 52 insertions(+), 67 deletions(-)
[pulsar] 01/02: [improve][build] Remove versions that are handled by netty-bom (#18629)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 0c9e8ea107dd8d07a1008e39eaa99ace6d905f3b
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri Nov 25 17:06:37 2022 +0200
[improve][build] Remove versions that are handled by netty-bom (#18629)
(cherry picked from commit b1a20360ba8f129543cbbc641d07631ada41e390)
---
pom.xml | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 85ae3df9e03..16b9133a669 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,6 @@ flexible messaging model and an intuitive client API.</description>
<dropwizardmetrics.version>3.2.5</dropwizardmetrics.version> <!-- ZooKeeper server -->
<curator.version>5.1.0</curator.version>
<netty.version>4.1.77.Final</netty.version>
- <netty-tc-native.version>2.0.52.Final</netty-tc-native.version>
<jetty.version>9.4.48.v20220622</jetty.version>
<conscrypt.version>2.5.2</conscrypt.version>
<jersey.version>2.34</jersey.version>
@@ -609,18 +608,6 @@ flexible messaging model and an intuitive client API.</description>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>${netty-tc-native.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-haproxy</artifactId>
- <version>${netty.version}</version>
- </dependency>
-
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
[pulsar] 02/02: [improve][misc] Upgrade Netty to 4.1.86.Final and Netty Tcnative to 2.0.54.Final (#18599)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 3cace2f546daa30c3321462936ddee54b3551830
Author: Lari Hotari <lh...@apache.org>
AuthorDate: Tue Dec 13 10:24:36 2022 +0200
[improve][misc] Upgrade Netty to 4.1.86.Final and Netty Tcnative to 2.0.54.Final (#18599)
(cherry picked from commit 1cd20c51c2d69c46e9de9a2870d7dc075fff9cc4)
---
buildtools/pom.xml | 2 +-
distribution/server/src/assemble/LICENSE.bin.txt | 50 +++++++++++-----------
pom.xml | 2 +-
.../apache/pulsar/broker/service/ServerCnx.java | 2 -
pulsar-sql/presto-distribution/LICENSE | 48 ++++++++++-----------
src/owasp-dependency-check-false-positives.xml | 2 +-
6 files changed, 52 insertions(+), 54 deletions(-)
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index 60b180815ba..dbc92f2bac0 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -131,7 +131,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
- <version>4.1.77.Final</version>
+ <version>4.1.86.Final</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 4378b335a36..795869058b5 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -352,31 +352,31 @@ The Apache Software License, Version 2.0
- org.apache.commons-commons-compress-1.21.jar
- org.apache.commons-commons-lang3-3.11.jar
* Netty
- - io.netty-netty-buffer-4.1.77.Final.jar
- - io.netty-netty-codec-4.1.77.Final.jar
- - io.netty-netty-codec-dns-4.1.77.Final.jar
- - io.netty-netty-codec-http-4.1.77.Final.jar
- - io.netty-netty-codec-http2-4.1.77.Final.jar
- - io.netty-netty-codec-socks-4.1.77.Final.jar
- - io.netty-netty-codec-haproxy-4.1.77.Final.jar
- - io.netty-netty-common-4.1.77.Final.jar
- - io.netty-netty-handler-4.1.77.Final.jar
- - io.netty-netty-handler-proxy-4.1.77.Final.jar
- - io.netty-netty-resolver-4.1.77.Final.jar
- - io.netty-netty-resolver-dns-4.1.77.Final.jar
- - io.netty-netty-transport-4.1.77.Final.jar
- - io.netty-netty-transport-classes-epoll-4.1.77.Final.jar
- - io.netty-netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar
- - io.netty-netty-transport-native-epoll-4.1.77.Final.jar
- - io.netty-netty-transport-native-unix-common-4.1.77.Final.jar
- - io.netty-netty-transport-native-unix-common-4.1.77.Final-linux-x86_64.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-aarch_64.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-x86_64.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-x86_64.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-windows-x86_64.jar
- - io.netty-netty-tcnative-classes-2.0.52.Final.jar
+ - io.netty-netty-buffer-4.1.86.Final.jar
+ - io.netty-netty-codec-4.1.86.Final.jar
+ - io.netty-netty-codec-dns-4.1.86.Final.jar
+ - io.netty-netty-codec-http-4.1.86.Final.jar
+ - io.netty-netty-codec-http2-4.1.86.Final.jar
+ - io.netty-netty-codec-socks-4.1.86.Final.jar
+ - io.netty-netty-codec-haproxy-4.1.86.Final.jar
+ - io.netty-netty-common-4.1.86.Final.jar
+ - io.netty-netty-handler-4.1.86.Final.jar
+ - io.netty-netty-handler-proxy-4.1.86.Final.jar
+ - io.netty-netty-resolver-4.1.86.Final.jar
+ - io.netty-netty-resolver-dns-4.1.86.Final.jar
+ - io.netty-netty-transport-4.1.86.Final.jar
+ - io.netty-netty-transport-classes-epoll-4.1.86.Final.jar
+ - io.netty-netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar
+ - io.netty-netty-transport-native-epoll-4.1.86.Final.jar
+ - io.netty-netty-transport-native-unix-common-4.1.86.Final.jar
+ - io.netty-netty-transport-native-unix-common-4.1.86.Final-linux-x86_64.jar
+ - io.netty-netty-tcnative-boringssl-static-2.0.54.Final.jar
+ - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar
+ - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar
+ - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar
+ - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar
+ - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar
+ - io.netty-netty-tcnative-classes-2.0.54.Final.jar
* Prometheus client
- io.prometheus-simpleclient-0.5.0.jar
- io.prometheus-simpleclient_common-0.5.0.jar
diff --git a/pom.xml b/pom.xml
index 16b9133a669..258fd3ba063 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@ flexible messaging model and an intuitive client API.</description>
<snappy.version>1.1.7</snappy.version> <!-- ZooKeeper server -->
<dropwizardmetrics.version>3.2.5</dropwizardmetrics.version> <!-- ZooKeeper server -->
<curator.version>5.1.0</curator.version>
- <netty.version>4.1.77.Final</netty.version>
+ <netty.version>4.1.86.Final</netty.version>
<jetty.version>9.4.48.v20220622</jetty.version>
<conscrypt.version>2.5.2</conscrypt.version>
<jersey.version>2.34</jersey.version>
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
index 7d9f2fc95b1..d18e154f379 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
@@ -2692,8 +2692,6 @@ public class ServerCnx extends PulsarHandler implements TransportCnx {
&& !autoReadDisabledRateLimiting && !autoReadDisabledPublishBufferLimiting) {
// Resume reading from socket if pending-request is not reached to threshold
ctx.channel().config().setAutoRead(true);
- // triggers channel read
- ctx.read();
throttledConnections.dec();
}
}
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index ec1244d2274..53260fba017 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -232,31 +232,31 @@ The Apache Software License, Version 2.0
- commons-lang3-3.11.jar
* Netty
- netty-3.10.6.Final.jar
- - netty-buffer-4.1.77.Final.jar
- - netty-codec-4.1.77.Final.jar
- - netty-codec-dns-4.1.77.Final.jar
- - netty-codec-http-4.1.77.Final.jar
- - netty-codec-haproxy-4.1.77.Final.jar
- - netty-codec-socks-4.1.77.Final.jar
- - netty-handler-proxy-4.1.77.Final.jar
- - netty-common-4.1.77.Final.jar
- - netty-handler-4.1.77.Final.jar
+ - netty-buffer-4.1.86.Final.jar
+ - netty-codec-4.1.86.Final.jar
+ - netty-codec-dns-4.1.86.Final.jar
+ - netty-codec-http-4.1.86.Final.jar
+ - netty-codec-haproxy-4.1.86.Final.jar
+ - netty-codec-socks-4.1.86.Final.jar
+ - netty-handler-proxy-4.1.86.Final.jar
+ - netty-common-4.1.86.Final.jar
+ - netty-handler-4.1.86.Final.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
- - netty-tcnative-boringssl-static-2.0.52.Final-linux-aarch_64.jar
- - netty-tcnative-boringssl-static-2.0.52.Final-linux-x86_64.jar
- - netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar
- - netty-tcnative-boringssl-static-2.0.52.Final-osx-x86_64.jar
- - netty-tcnative-boringssl-static-2.0.52.Final-windows-x86_64.jar
- - netty-tcnative-classes-2.0.52.Final.jar
- - netty-transport-4.1.77.Final.jar
- - netty-transport-classes-epoll-4.1.77.Final.jar
- - netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar
- - netty-transport-native-unix-common-4.1.77.Final.jar
- - netty-transport-native-unix-common-4.1.77.Final-linux-x86_64.jar
- - netty-codec-http2-4.1.77.Final.jar
+ - netty-resolver-4.1.86.Final.jar
+ - netty-resolver-dns-4.1.86.Final.jar
+ - netty-tcnative-boringssl-static-2.0.54.Final.jar
+ - netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar
+ - netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar
+ - netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar
+ - netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar
+ - netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar
+ - netty-tcnative-classes-2.0.54.Final.jar
+ - netty-transport-4.1.86.Final.jar
+ - netty-transport-classes-epoll-4.1.86.Final.jar
+ - netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar
+ - netty-transport-native-unix-common-4.1.86.Final.jar
+ - netty-transport-native-unix-common-4.1.86.Final-linux-x86_64.jar
+ - netty-codec-http2-4.1.86.Final.jar
* GRPC
- grpc-api-1.45.1.jar
- grpc-context-1.45.1.jar
diff --git a/src/owasp-dependency-check-false-positives.xml b/src/owasp-dependency-check-false-positives.xml
index 213bf94371d..ea558818665 100644
--- a/src/owasp-dependency-check-false-positives.xml
+++ b/src/owasp-dependency-check-false-positives.xml
@@ -56,7 +56,7 @@
</suppress>
<suppress>
<notes><![CDATA[
- file name: netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar
+ file name: netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/io\.netty/netty\-tcnative\-boringssl\-static@.*$</packageUrl>
<cpe>cpe:/a:chromium_project:chromium</cpe>