Merge remote-tracking branch 'apache/branch-2.10' into test-2.10.6

liangyepianzhou · Mar 7, 2024 · c40941d · c40941d
2 parents 88b89e9 + cb65e17
commit c40941d
Show file tree

Hide file tree

Showing 133 changed files with 622 additions and 312 deletions.
diff --git a/bouncy-castle/bc/pom.xml b/bouncy-castle/bc/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>bouncy-castle-parent</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/bouncy-castle/bcfips-include-test/pom.xml b/bouncy-castle/bcfips-include-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>bouncy-castle-parent</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/bouncy-castle/bcfips/pom.xml b/bouncy-castle/bcfips/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>bouncy-castle-parent</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/bouncy-castle/pom.xml b/bouncy-castle/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>pulsar</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/buildtools/pom.xml b/buildtools/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>org.apache.pulsar</groupId>
   <artifactId>buildtools</artifactId>
-  <version>2.10.6-SNAPSHOT</version>
+  <version>2.10.6</version>
   <packaging>jar</packaging>
   <name>Pulsar Build Tools</name>
 

diff --git a/distribution/io/pom.xml b/distribution/io/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>distribution</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/distribution/offloaders/pom.xml b/distribution/offloaders/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>distribution</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>pulsar</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>distribution</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/docker/pom.xml b/docker/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>pulsar</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
   </parent>
   <artifactId>docker-images</artifactId>
   <name>Apache Pulsar :: Docker Images</name>

diff --git a/docker/pulsar-all/pom.xml b/docker/pulsar-all/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>docker-images</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pulsar-all-docker-image</artifactId>

diff --git a/docker/pulsar/pom.xml b/docker/pulsar/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>docker-images</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pulsar-docker-image</artifactId>

diff --git a/jclouds-shaded/pom.xml b/jclouds-shaded/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>pulsar</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/kafka-connect-avro-converter-shaded/pom.xml b/kafka-connect-avro-converter-shaded/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>pulsar</artifactId>
         <groupId>org.apache.pulsar</groupId>
-        <version>2.10.6-SNAPSHOT</version>
+        <version>2.10.6</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/managed-ledger/pom.xml b/managed-ledger/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>pulsar</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
   <groupId>org.apache.pulsar</groupId>
   <artifactId>pulsar</artifactId>
 
-  <version>2.10.6-SNAPSHOT</version>
+  <version>2.10.6</version>
 
   <name>Pulsar</name>
   <description>Pulsar is a distributed pub-sub messaging platform with a very

diff --git a/pulsar-broker-auth-athenz/pom.xml b/pulsar-broker-auth-athenz/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>pulsar</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
   </parent>
 
   <artifactId>pulsar-broker-auth-athenz</artifactId>

diff --git a/pulsar-broker-auth-sasl/pom.xml b/pulsar-broker-auth-sasl/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>pulsar</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
   </parent>
 
   <artifactId>pulsar-broker-auth-sasl</artifactId>

diff --git a/pulsar-broker-common/pom.xml b/pulsar-broker-common/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>pulsar</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
   </parent>
 
   <artifactId>pulsar-broker-common</artifactId>

diff --git a/pulsar-broker-shaded/pom.xml b/pulsar-broker-shaded/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>pulsar</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>pulsar</artifactId>
-    <version>2.10.6-SNAPSHOT</version>
+    <version>2.10.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
@@ -798,6 +798,17 @@ protected static boolean isRedirectException(Throwable ex) {
                 == Status.TEMPORARY_REDIRECT.getStatusCode();
     }
 
+    protected static boolean isNotFoundException(Throwable ex) {
+        Throwable realCause = FutureUtil.unwrapCompletionException(ex);
+        return realCause instanceof WebApplicationException
+                && ((WebApplicationException) realCause).getResponse().getStatus()
+                == Status.NOT_FOUND.getStatusCode();
+    }
+
+    protected static boolean isNot307And404Exception(Throwable ex) {
+        return !isRedirectException(ex) && !isNotFoundException(ex);
+    }
+
     protected static String getTopicNotFoundErrorMessage(String topic) {
         return String.format("Topic %s not found", topic);
     }