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 2024/12/06 23:31:12 UTC
(pulsar) branch branch-3.0 updated (0dec7d77e9c -> f16cf67baf3)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a change to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from 0dec7d77e9c Bump version to next snapshot version
new 8168df14987 [fix] [broker] Add consumer name for subscription stats (#23671)
new 0d2ff97cbd7 [improve][io] Bump io.lettuce:lettuce-core from 5.0.2.RELEASE to 6.5.1.RELEASE in /pulsar-io/redis (#23685)
new f16cf67baf3 [fix][sec] Bump commons-io version to 2.18.0 (#23684)
The 3 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:
distribution/server/src/assemble/LICENSE.bin.txt | 2 +-
distribution/shell/src/assemble/LICENSE.bin.txt | 2 +-
pom.xml | 2 +-
.../src/main/java/org/apache/pulsar/broker/service/Consumer.java | 1 +
pulsar-io/redis/pom.xml | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
(pulsar) 01/03: [fix] [broker] Add consumer name for subscription stats (#23671)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 8168df14987ec6cd6b932f0ea7793353124f9737
Author: Hang Chen <ch...@apache.org>
AuthorDate: Wed Dec 4 10:01:44 2024 +0800
[fix] [broker] Add consumer name for subscription stats (#23671)
(cherry picked from commit 59d4588c1924df6e6a5e9eb9c525f6db0beeddf4)
---
.../src/main/java/org/apache/pulsar/broker/service/Consumer.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
index 96947dc2cb3..dbb594cce31 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
@@ -886,6 +886,7 @@ public class Consumer {
stats.unackedMessages = unackedMessages;
stats.blockedConsumerOnUnackedMsgs = blockedConsumerOnUnackedMsgs;
stats.avgMessagesPerEntry = getAvgMessagesPerEntry();
+ stats.consumerName = consumerName;
if (readPositionWhenJoining != null) {
stats.readPositionWhenJoining = readPositionWhenJoining.toString();
}
(pulsar) 02/03: [improve][io] Bump io.lettuce:lettuce-core from 5.0.2.RELEASE to 6.5.1.RELEASE in /pulsar-io/redis (#23685)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 0d2ff97cbd7ca4904cf1f1f7fdcea6ddc610fc1a
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Dec 6 10:14:06 2024 -0800
[improve][io] Bump io.lettuce:lettuce-core from 5.0.2.RELEASE to 6.5.1.RELEASE in /pulsar-io/redis (#23685)
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 28e47fa99dcb080385cfa567b844e74ab0cd85b1)
---
pulsar-io/redis/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pulsar-io/redis/pom.xml b/pulsar-io/redis/pom.xml
index ffcd858f516..8a7bfb1c5ba 100644
--- a/pulsar-io/redis/pom.xml
+++ b/pulsar-io/redis/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
- <version>5.0.2.RELEASE</version>
+ <version>6.5.1.RELEASE</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
(pulsar) 03/03: [fix][sec] Bump commons-io version to 2.18.0 (#23684)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit f16cf67baf3788cffe55b14fb08898b05e27b93f
Author: ZachChuba <49...@users.noreply.github.com>
AuthorDate: Fri Dec 6 18:22:18 2024 -0500
[fix][sec] Bump commons-io version to 2.18.0 (#23684)
Co-authored-by: Zach Chuba <za...@fiserv.com>
(cherry picked from commit e6f421e670792e83594fe6fee5e92f0a586e7a9e)
---
distribution/server/src/assemble/LICENSE.bin.txt | 2 +-
distribution/shell/src/assemble/LICENSE.bin.txt | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index a94e8801f4e..f39299b1bf9 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -281,7 +281,7 @@ The Apache Software License, Version 2.0
- commons-cli-commons-cli-1.5.0.jar
- commons-codec-commons-codec-1.15.jar
- commons-configuration-commons-configuration-1.10.jar
- - commons-io-commons-io-2.14.0.jar
+ - commons-io-commons-io-2.18.0.jar
- commons-lang-commons-lang-2.6.jar
- commons-logging-commons-logging-1.1.1.jar
- org.apache.commons-commons-collections4-4.4.jar
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
index ed880576385..de198ba2edc 100644
--- a/distribution/shell/src/assemble/LICENSE.bin.txt
+++ b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -341,7 +341,7 @@ The Apache Software License, Version 2.0
* Apache Commons
- commons-codec-1.15.jar
- commons-configuration-1.10.jar
- - commons-io-2.14.0.jar
+ - commons-io-2.18.0.jar
- commons-lang-2.6.jar
- commons-logging-1.2.jar
- commons-lang3-3.11.jar
diff --git a/pom.xml b/pom.xml
index b5f47ee9b5b..b3fd9134b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@ flexible messaging model and an intuitive client API.</description>
<jcommander.version>1.82</jcommander.version>
<commons-lang3.version>3.11</commons-lang3.version>
<commons-configuration.version>1.10</commons-configuration.version>
- <commons-io.version>2.14.0</commons-io.version>
+ <commons-io.version>2.18.0</commons-io.version>
<commons-codec.version>1.15</commons-codec.version>
<jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
<hdrHistogram.version>2.1.9</hdrHistogram.version>