Merge branch '3.3' into feat/remove_old_zookeeper

.gitignore

@@ -11,6 +11,8 @@ target/
 .settings/
 .project
 .classpath
+.externalToolBuilders
+maven-eclipse.xml
 
 # idea ignore
 .idea/

dubbo-dependencies-bom/pom.xml

@@ -90,16 +90,16 @@
   <properties>
     <!-- Common libs -->
     <!-- <spring_version>4.3.30.RELEASE</spring_version> -->
-    <spring_version>5.3.33</spring_version>
+    <spring_version>5.3.34</spring_version>
     <spring_security_version>5.8.12</spring_security_version>
     <javassist_version>3.30.2-GA</javassist_version>
-    <byte-buddy_version>1.14.13</byte-buddy_version>
+    <byte-buddy_version>1.14.14</byte-buddy_version>
     <netty_version>3.2.10.Final</netty_version>
     <netty4_version>4.1.109.Final</netty4_version>
     <httpclient_version>4.5.14</httpclient_version>
     <httpcore_version>4.4.16</httpcore_version>
     <fastjson_version>1.2.83</fastjson_version>
-    <fastjson2_version>2.0.48</fastjson2_version>
+    <fastjson2_version>2.0.49</fastjson2_version>
     <zookeeper_version>3.7.2</zookeeper_version>
     <curator_version>5.1.0</curator_version>
     <curator_test_version>2.12.0</curator_test_version>
@@ -119,7 +119,7 @@
     <snakeyaml_version>2.2</snakeyaml_version>
     <commons_lang3_version>3.14.0</commons_lang3_version>
     <envoy_api_version>0.1.35</envoy_api_version>
-    <micrometer.version>1.12.4</micrometer.version>
+    <micrometer.version>1.12.5</micrometer.version>
     <opentelemetry.version>1.26.0</opentelemetry.version>
     <zipkin-reporter.version>2.16.4</zipkin-reporter.version>
     <micrometer-tracing.version>1.2.5</micrometer-tracing.version>
@@ -175,7 +175,7 @@
     <sofa_registry_version>5.4.3</sofa_registry_version>
     <metrics_version>2.0.6</metrics_version>
     <gson_version>2.10.1</gson_version>
-    <jackson_version>2.17.0</jackson_version>
+    <jackson_version>2.17.1</jackson_version>
     <mortbay_jetty_version>6.1.26</mortbay_jetty_version>
     <portlet_version>2.0</portlet_version>
     <maven_flatten_version>1.6.0</maven_flatten_version>

dubbo-maven-plugin/pom.xml

@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.12.0</version>
+      <version>3.13.0</version>
       <scope>provided</scope>
     </dependency>
 

dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/config/HttpClientConfig.java

@@ -22,6 +22,10 @@ public class HttpClientConfig {
     private int connectTimeout = 6 * 1000;
     private int chunkLength = 8196;
 
+    private int maxIdleConnections = 20;
+
+    private int keepAliveDuration = 30 * 1000;
+
     private int HTTP_CLIENT_CONNECTION_MANAGER_MAX_PER_ROUTE = 20;
     private int HTTP_CLIENT_CONNECTION_MANAGER_MAX_TOTAL = 20;
     private int HTTPCLIENT_KEEP_ALIVE_DURATION = 30 * 1000;
@@ -57,4 +61,24 @@ public void setConnectTimeout(int connectTimeout) {
     public int getChunkLength() {
         return chunkLength;
     }
+
+    public int getMaxIdleConnections() {
+
+        return maxIdleConnections;
+    }
+
+    public void setMaxIdleConnections(int maxIdleConnections) {
+
+        this.maxIdleConnections = maxIdleConnections;
+    }
+
+    public int getKeepAliveDuration() {
+
+        return keepAliveDuration;
+    }
+
+    public void setKeepAliveDuration(int keepAliveDuration) {
+
+        this.keepAliveDuration = keepAliveDuration;
+    }
 }

dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/restclient/OKHttpRestClient.java

@@ -30,6 +30,7 @@
 
 import okhttp3.Call;
 import okhttp3.Callback;
+import okhttp3.ConnectionPool;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
@@ -140,11 +141,15 @@ public boolean isClosed() {
     }
 
     public OkHttpClient createHttpClient(HttpClientConfig httpClientConfig) {
-        OkHttpClient client = new OkHttpClient.Builder()
+
+        return new OkHttpClient.Builder()
                 .readTimeout(httpClientConfig.getReadTimeout(), TimeUnit.SECONDS)
                 .writeTimeout(httpClientConfig.getWriteTimeout(), TimeUnit.SECONDS)
                 .connectTimeout(httpClientConfig.getConnectTimeout(), TimeUnit.SECONDS)
+                .connectionPool(new ConnectionPool(
+                        httpClientConfig.getMaxIdleConnections(),
+                        httpClientConfig.getKeepAliveDuration(),
+                        TimeUnit.SECONDS))
                 .build();
-        return client;
     }
 }

dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml

@@ -36,7 +36,7 @@
   </modules>
 
   <properties>
-    <micrometer.version>1.12.4</micrometer.version>
+    <micrometer.version>1.12.5</micrometer.version>
     <micrometer-tracing.version>1.2.5</micrometer-tracing.version>
     <opentelemetry.version>1.34.1</opentelemetry.version>
     <zipkin-reporter.version>2.17.2</zipkin-reporter.version>

dubbo-spring-boot/pom.xml

@@ -41,7 +41,7 @@
   <properties>
     <spring-boot.version>2.7.18</spring-boot.version>
     <!-- Spring boot buddy is lower than the delivery dependency package version and can only show the defined dependency version -->
-    <byte-buddy.version>1.14.13</byte-buddy.version>
+    <byte-buddy.version>1.14.14</byte-buddy.version>
     <mockito_version>4.11.0</mockito_version>
   </properties>
 

dubbo-test/dubbo-test-spring3.2/pom.xml

@@ -28,7 +28,7 @@
 
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
-    <spring_version>5.3.33</spring_version>
+    <spring_version>5.3.34</spring_version>
   </properties>
 
   <dependencyManagement>

dubbo-test/dubbo-test-spring4.1/pom.xml

@@ -28,7 +28,7 @@
 
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
-    <spring_version>5.3.33</spring_version>
+    <spring_version>5.3.34</spring_version>
   </properties>
 
   <dependencyManagement>

dubbo-test/dubbo-test-spring4.2/pom.xml

@@ -28,7 +28,7 @@
 
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
-    <spring_version>5.3.33</spring_version>
+    <spring_version>5.3.34</spring_version>
   </properties>
 
   <dependencyManagement>

pom.xml

@@ -129,7 +129,7 @@
     <jacoco.skip>true</jacoco.skip>
 
     <!-- Maven plugins -->
-    <maven_jar_version>3.3.0</maven_jar_version>
+    <maven_jar_version>3.4.1</maven_jar_version>
     <maven_surefire_version>3.2.5</maven_surefire_version>
     <maven_failsafe_version>3.2.5</maven_failsafe_version>
     <maven_deploy_version>2.8.2</maven_deploy_version>
@@ -280,7 +280,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.5.2</version>
+          <version>3.5.3</version>
           <configuration>
             <createDependencyReducedPom>false</createDependencyReducedPom>
           </configuration>