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

dinglei pushed a commit to branch 4.9.x
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/4.9.x by this push:
     new 6ee8d0718e [4.9.x] Promptly return a response when the validation 
parameters cannot be modified (#7849)
6ee8d0718e is described below

commit 6ee8d0718ed39edde0f5aa5437b6050e92b4958f
Author: rongtong <[email protected]>
AuthorDate: Thu Feb 22 17:11:38 2024 +0800

    [4.9.x] Promptly return a response when the validation parameters cannot be 
modified (#7849)
    
    * Revert "[maven-release-plugin] prepare for next development iteration"
    
    This reverts commit 9122e1ced00429c2a6bced2e77c4c929991e9ae8.
    
    * Revert "[maven-release-plugin] prepare release rocketmq-all-4.9.8"
    
    This reverts commit 8b287928fb4c8c565282c019ef668c43e6eb3289.
    
    * Promptly return a response when the validation parameters cannot be 
modified
---
 acl/pom.xml                                                             | 2 +-
 broker/pom.xml                                                          | 2 +-
 .../java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java | 1 +
 client/pom.xml                                                          | 2 +-
 common/pom.xml                                                          | 2 +-
 distribution/pom.xml                                                    | 2 +-
 example/pom.xml                                                         | 2 +-
 filter/pom.xml                                                          | 2 +-
 logging/pom.xml                                                         | 2 +-
 namesrv/pom.xml                                                         | 2 +-
 openmessaging/pom.xml                                                   | 2 +-
 pom.xml                                                                 | 2 +-
 remoting/pom.xml                                                        | 2 +-
 srvutil/pom.xml                                                         | 2 +-
 store/pom.xml                                                           | 2 +-
 test/pom.xml                                                            | 2 +-
 tools/pom.xml                                                           | 2 +-
 17 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/acl/pom.xml b/acl/pom.xml
index 4de3db4f0f..8257e8b0e7 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
     <artifactId>rocketmq-acl</artifactId>
     <name>rocketmq-acl ${project.version}</name>
diff --git a/broker/pom.xml b/broker/pom.xml
index e684da9173..d5e1b89aa5 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
index 259e760571..64635d0eae 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
@@ -511,6 +511,7 @@ public class AdminBrokerProcessor extends 
AsyncNettyRequestProcessor {
                     if (validateBlackListConfigExist(properties)) {
                         response.setCode(ResponseCode.NO_PERMISSION);
                         response.setRemark("Can not update config in black 
list.");
+                        return response;
                     }
 
                     log.info("updateBrokerConfig, new config: [{}] client: {} 
", properties, ctx.channel().remoteAddress());
diff --git a/client/pom.xml b/client/pom.xml
index 550ccc08a7..af6c1e4245 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/common/pom.xml b/common/pom.xml
index 2f33816295..7a98f28856 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index c49acf44d4..ed0d6dab7d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
     <artifactId>rocketmq-distribution</artifactId>
     <name>rocketmq-distribution ${project.version}</name>
diff --git a/example/pom.xml b/example/pom.xml
index 815ecf9a45..cc9b65f66a 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>rocketmq-all</artifactId>
         <groupId>org.apache.rocketmq</groupId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/filter/pom.xml b/filter/pom.xml
index 35c450ac38..dfe8be2a1d 100644
--- a/filter/pom.xml
+++ b/filter/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>rocketmq-all</artifactId>
         <groupId>org.apache.rocketmq</groupId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/logging/pom.xml b/logging/pom.xml
index b2f3eb2ab9..d38333e7f2 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/namesrv/pom.xml b/namesrv/pom.xml
index cdc81641e0..b8ce22a519 100644
--- a/namesrv/pom.xml
+++ b/namesrv/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/openmessaging/pom.xml b/openmessaging/pom.xml
index c1ac4378f0..c748a72f28 100644
--- a/openmessaging/pom.xml
+++ b/openmessaging/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>rocketmq-all</artifactId>
         <groupId>org.apache.rocketmq</groupId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index acfc49aa19..b99cbc6057 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <inceptionYear>2012</inceptionYear>
     <groupId>org.apache.rocketmq</groupId>
     <artifactId>rocketmq-all</artifactId>
-    <version>4.9.9-SNAPSHOT</version>
+    <version>4.9.8-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache RocketMQ ${project.version}</name>
     <url>http://rocketmq.apache.org/</url>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 324e757700..b8f8b89d7d 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/srvutil/pom.xml b/srvutil/pom.xml
index ad7cd8d2af..f6045ecf6e 100644
--- a/srvutil/pom.xml
+++ b/srvutil/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/store/pom.xml b/store/pom.xml
index 7d76697013..5067415e87 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/pom.xml b/test/pom.xml
index 73046cb145..b5806f865c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>rocketmq-all</artifactId>
         <groupId>org.apache.rocketmq</groupId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tools/pom.xml b/tools/pom.xml
index 9c21428476..314aab9b20 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
-        <version>4.9.9-SNAPSHOT</version>
+        <version>4.9.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Reply via email to