Merge branch 'refs/heads/3.3' into feat/remove_test3

Author: CrazyHZM

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,4 +5,4 @@
 - [x] Make sure there is a [GitHub_issue](https://github.com/apache/dubbo/issues) field for the change.
 - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
 - [x] Write necessary unit-test to verify your logic correction. If the new feature or significant change is committed, please remember to add sample in [dubbo samples](https://github.com/apache/dubbo-samples) project.
-- [x] Make sure gitHub actions can pass. [Why the workflow is failing and how to fix it?](./CONTRIBUTING.md)
+- [x] Make sure gitHub actions can pass. [Why the workflow is failing and how to fix it?](../CONTRIBUTING.md)

dubbo-cluster/pom.xml

@@ -47,16 +47,6 @@
       <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.curator</groupId>
-      <artifactId>curator-framework</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-serialization-hessian2</artifactId>
@@ -69,12 +59,6 @@
       <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-test-check</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-metrics-registry</artifactId>

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/ConfigConditionRouterTest.java

@@ -237,7 +237,7 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.20.3</version>
+      <version>1.20.4</version>
       <scope>test</scope>
     </dependency>
 

dubbo-config/dubbo-config-api/pom.xml

@@ -40,13 +40,6 @@
       <version>${project.parent.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-test-common</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-framework</artifactId>

dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml

@@ -38,12 +38,4 @@
     <skip_maven_deploy>false</skip_maven_deploy>
   </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-test-check</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 </project>

dubbo-configcenter/pom.xml

@@ -91,7 +91,7 @@
     <!-- <spring_version>4.3.30.RELEASE</spring_version> -->
     <spring_version>5.3.39</spring_version>
     <spring_boot_version>2.7.18</spring_boot_version>
-    <spring_security_version>5.8.15</spring_security_version>
+    <spring_security_version>5.8.16</spring_security_version>
     <javassist_version>3.30.2-GA</javassist_version>
     <byte-buddy_version>1.15.10</byte-buddy_version>
     <netty_version>3.2.10.Final</netty_version>
@@ -104,7 +104,6 @@
     <zookeeper_version>3.7.2</zookeeper_version>
     <curator_version>5.7.1</curator_version>
     <curator_test_version>2.12.0</curator_test_version>
-    <jedis_version>3.10.0</jedis_version>
     <hessian_version>4.0.66</hessian_version>
     <protobuf-java_version>3.25.5</protobuf-java_version>
     <javax_annotation-api_version>1.3.2</javax_annotation-api_version>
@@ -150,8 +149,8 @@
     <log4j_version>1.2.17</log4j_version>
     <logback_version>1.2.13</logback_version>
     <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
-    <log4j2_version>2.24.1</log4j2_version>
-    <commons_io_version>2.17.0</commons_io_version>
+    <log4j2_version>2.24.2</log4j2_version>
+    <commons_io_version>2.18.0</commons_io_version>
     <commons-codec_version>1.17.1</commons-codec_version>
     <groovy_version>4.0.24</groovy_version>
 
@@ -161,19 +160,17 @@
     <awaitility_version>4.2.2</awaitility_version>
     <hamcrest_version>2.2</hamcrest_version>
     <cglib_version>2.2.2</cglib_version>
-    <embedded_redis_version>1.4.3</embedded_redis_version>
     <mockito_version>4.11.0</mockito_version>
     <spock_version>2.3-groovy-4.0</spock_version>
 
     <jaxb_version>2.2.7</jaxb_version>
     <activation_version>1.2.0</activation_version>
-    <test_container_version>1.20.3</test_container_version>
+    <test_container_version>1.20.4</test_container_version>
     <hessian_lite_version>4.0.3</hessian_lite_version>
     <swagger_version>1.6.14</swagger_version>
 
     <snappy_java_version>1.1.10.7</snappy_java_version>
     <bouncycastle-bcprov_version>1.70</bouncycastle-bcprov_version>
-    <sofa_registry_version>5.4.3</sofa_registry_version>
     <metrics_version>2.0.6</metrics_version>
     <gson_version>2.11.0</gson_version>
     <jackson_version>2.18.1</jackson_version>
@@ -185,7 +182,6 @@
     <spotless.action>check</spotless.action>
     <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
-    <open_feign_version>3.1.9</open_feign_version>
     <jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
     <jaxb-runtime.version>2.4.0-b180830.0438</jaxb-runtime.version>
     <!-- Spring boot buddy is lower than the delivery dependency package version and can only show the defined dependency version -->
@@ -400,11 +396,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>redis.clients</groupId>
-        <artifactId>jedis</artifactId>
-        <version>${jedis_version}</version>
-      </dependency>
 
       <!-- Alibaba -->
 
@@ -724,19 +715,6 @@
         <version>${swagger_version}</version>
       </dependency>
 
-      <!-- for dubbo-registry-sofa -->
-      <dependency>
-        <groupId>com.alipay.sofa</groupId>
-        <artifactId>registry-client-all</artifactId>
-        <version>${sofa_registry_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.alipay.sofa</groupId>
-        <artifactId>registry-test</artifactId>
-        <version>${sofa_registry_version}</version>
-        <scope>test</scope>
-      </dependency>
-
       <!-- Test libs -->
       <dependency>
         <groupId>org.junit.jupiter</groupId>
@@ -804,12 +782,6 @@
         <version>${cglib_version}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>com.github.codemonstur</groupId>
-        <artifactId>embedded-redis</artifactId>
-        <version>${embedded_redis_version}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-test</artifactId>
@@ -998,11 +970,6 @@
         <artifactId>rxjava</artifactId>
         <version>${rxjava.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-openfeign-core</artifactId>
-        <version>${open_feign_version}</version>
-      </dependency>
       <dependency>
         <groupId>jakarta.xml.bind</groupId>
         <artifactId>jakarta.xml.bind-api</artifactId>

dubbo-dependencies-bom/pom.xml

@@ -75,7 +75,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.17.0</version>
+      <version>2.18.0</version>
     </dependency>
 
     <!-- Takes no effect for this dependency. To notify github dependencies bot to update ${protobuf-java.version} property.  -->

dubbo-maven-plugin/pom.xml

@@ -180,6 +180,7 @@ public void unregister(Invoker<?> invoker) {
         if (tree == null) {
             return;
         }
+
         lock.writeLock().lock();
         try {
             tree.remove(mapping -> mapping.meta.getInvoker() == invoker);
@@ -193,6 +194,7 @@ public void destroy() {
         if (tree == null) {
             return;
         }
+
         lock.writeLock().lock();
         try {
             tree.clear();
@@ -202,6 +204,10 @@ public void destroy() {
     }
 
     public HandlerMeta lookup(HttpRequest request) {
+        if (tree == null) {
+            return null;
+        }
+
         String stringPath = PathUtils.normalize(request.uri());
         request.setAttribute(RestConstants.PATH_ATTRIBUTE, stringPath);
         KeyString path = new KeyString(stringPath, restConfig.getCaseSensitiveMatchOrDefault());
@@ -365,6 +371,10 @@ private void handleNoMatch(HttpRequest request, List<RequestMapping> partialMatc
 
     @Override
     public boolean exists(String stringPath, String method) {
+        if (tree == null) {
+            return false;
+        }
+
         KeyString path = new KeyString(stringPath, restConfig.getCaseSensitiveMatchOrDefault());
         if (tryExists(path, method)) {
             return true;

dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/DefaultRequestMappingRegistry.java

@@ -52,6 +52,12 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-config-spring</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
 
     <!-- Test Dependencies -->
     <dependency>