Merge branch 'refs/heads/apache-3.3' into 3.3.3-release

dubbo-cluster/pom.xml

@@ -29,7 +29,7 @@
   <description>The cluster module of dubbo project</description>
   <properties>
     <skip_maven_deploy>false</skip_maven_deploy>
-    <nashorn-core.version>15.4</nashorn-core.version>
+    <nashorn-core.version>15.6</nashorn-core.version>
   </properties>
   <dependencies>
     <dependency>

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java

@@ -102,7 +102,7 @@ void testSelectByWeight() {
     @Test
     void testNodeCacheShouldNotRecycle() {
         int loop = 10000;
-        // tmperately add a new invoker
+        // temperately add a new invoker
         weightInvokers.add(weightInvokerTmp);
         try {
             Map<Invoker, InvokeResult> resultMap = getWeightedInvokeResult(loop, RoundRobinLoadBalance.NAME);
@@ -143,7 +143,7 @@ void testNodeCacheShouldRecycle() {
         }
 
         int loop = 10000;
-        // tmperately add a new invoker
+        // temperately add a new invoker
         weightInvokers.add(weightInvokerTmp);
         try {
             Map<Invoker, InvokeResult> resultMap = getWeightedInvokeResult(loop, RoundRobinLoadBalance.NAME);

dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java

@@ -883,7 +883,7 @@ private void postProcessConfig() {
 
     /**
      * Return if ReferenceConfig has been initialized
-     * Note: Cannot use `isInitilized` as it may be treated as a Java Bean property
+     * Note: Cannot use `isInitialized` as it may be treated as a Java Bean property
      *
      * @return initialized
      */

dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/AbstractInterfaceBuilder.java

@@ -53,7 +53,7 @@ public abstract class AbstractInterfaceBuilder<
     protected MonitorConfig monitor;
 
     /**
-     * Strategies for generating dynamic agents，there are two strategies can be choosed: jdk and javassist
+     * Strategies for generating dynamic agents，there are two strategies can be chosen: jdk and javassist
      */
     protected String proxy;
 

dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/issues/issue6000/Issue6000Test.java

@@ -31,7 +31,7 @@
 
 /**
  * The test-case for https://github.com/apache/dubbo/issues/6000
- * Autowired a ReferenceBean failed in some situation in Spring enviroment
+ * Autowired a ReferenceBean failed in some situation in Spring environment
  */
 @Configuration
 @EnableDubbo

dubbo-demo/dubbo-demo-spring-boot/pom.xml

@@ -39,7 +39,7 @@
     <skip_maven_deploy>true</skip_maven_deploy>
     <spring-boot.version>2.7.18</spring-boot.version>
     <spring-boot-maven-plugin.version>2.7.18</spring-boot-maven-plugin.version>
-    <micrometer-core.version>1.14.1</micrometer-core.version>
+    <micrometer-core.version>1.14.2</micrometer-core.version>
   </properties>
 
   <dependencyManagement>

dubbo-dependencies-bom/pom.xml

@@ -93,7 +93,7 @@
     <spring_boot_version>2.7.18</spring_boot_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>
+    <byte-buddy_version>1.15.11</byte-buddy_version>
     <netty_version>3.2.10.Final</netty_version>
     <netty4_version>4.1.115.Final</netty4_version>
     <netty_http3_version>0.0.28.Final</netty_http3_version>
@@ -125,11 +125,11 @@
     <micrometer.version>1.13.6</micrometer.version>
     <opentelemetry.version>1.45.0</opentelemetry.version>
     <zipkin-reporter.version>3.4.3</zipkin-reporter.version>
-    <micrometer-tracing.version>1.4.0</micrometer-tracing.version>
+    <micrometer-tracing.version>1.4.1</micrometer-tracing.version>
     <t_digest.version>3.3</t_digest.version>
     <prometheus_client.version>0.16.0</prometheus_client.version>
     <reactive.version>1.0.4</reactive.version>
-    <reactor.version>3.7.0</reactor.version>
+    <reactor.version>3.7.1</reactor.version>
     <rxjava.version>2.2.21</rxjava.version>
     <okhttp_version>3.14.9</okhttp_version>
 
@@ -140,7 +140,7 @@
     <nacos_version>2.4.3</nacos_version>
     <sentinel.version>1.8.8</sentinel.version>
     <seata.version>1.8.0</seata.version>
-    <grpc.version>1.68.2</grpc.version>
+    <grpc.version>1.69.0</grpc.version>
     <grpc_contrib_verdion>0.8.1</grpc_contrib_verdion>
     <jprotoc_version>1.2.2</jprotoc_version>
     <mustache_version>0.9.14</mustache_version>
@@ -150,7 +150,7 @@
     <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.2</log4j2_version>
+    <log4j2_version>2.24.3</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>

dubbo-maven-plugin/pom.xml

@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.5.1</version>
+      <version>3.6.0</version>
     </dependency>
 
     <dependency>

dubbo-plugin/dubbo-rest-jaxrs/pom.xml

@@ -120,7 +120,7 @@
         <dependency>
           <groupId>org.apache.dubbo.extensions</groupId>
           <artifactId>dubbo-rpc-rest</artifactId>
-          <version>3.3.0</version>
+          <version>3.3.1</version>
           <scope>test</scope>
         </dependency>
       </dependencies>

dubbo-plugin/dubbo-rest-openapi/pom.xml

@@ -27,10 +27,10 @@
   <artifactId>dubbo-rest-openapi</artifactId>
 
   <properties>
-    <swagger-annotations.version>2.2.25</swagger-annotations.version>
+    <swagger-annotations.version>2.2.27</swagger-annotations.version>
     <swagger-ui.version>5.18.2</swagger-ui.version>
     <redoc.version>2.2.0</redoc.version>
-    <webjars-locator.version>1.0.0</webjars-locator.version>
+    <webjars-locator.version>1.0.1</webjars-locator.version>
     <therapi.version>0.15.0</therapi.version>
   </properties>
 

dubbo-plugin/dubbo-rest-spring/pom.xml

@@ -129,7 +129,7 @@
         <dependency>
           <groupId>org.apache.dubbo.extensions</groupId>
           <artifactId>dubbo-rpc-rest</artifactId>
-          <version>3.3.0</version>
+          <version>3.3.1</version>
           <scope>test</scope>
         </dependency>
       </dependencies>

dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/TelnetCodecTest.java

@@ -247,7 +247,7 @@ void testDecode_Backspace() throws IOException {
         testDecode_assertEquals(new byte[] {'\b'}, Codec2.DecodeResult.NEED_MORE_INPUT, new String(new byte[] {32, 8}));
 
         // test chinese
-        byte[] chineseBytes = "中".getBytes();
+        byte[] chineseBytes = "中".getBytes(StandardCharsets.UTF_8);
         byte[] request = join(chineseBytes, new byte[] {'\b'});
         testDecode_assertEquals(request, Codec2.DecodeResult.NEED_MORE_INPUT, new String(new byte[] {32, 32, 8, 8}));
         // There may be some problem handling chinese (negative number recognition). Ignoring this problem, the

dubbo-test/dubbo-test-check/pom.xml

@@ -33,7 +33,7 @@
     <curator5.version>4.2.0</curator5.version>
     <commons.compress.version>1.27.1</commons.compress.version>
     <commons.exec.version>1.4.0</commons.exec.version>
-    <async.http.client.version>2.12.3</async.http.client.version>
+    <async.http.client.version>2.12.4</async.http.client.version>
   </properties>
 
   <dependencies>

pom.xml

@@ -164,8 +164,8 @@
     <maven_gmavenplus_version>3.0.2</maven_gmavenplus_version>
 
     <!-- For unify spring boot 3 version -->
-    <spring-6.version>6.2.0</spring-6.version>
-    <spring-boot-3.version>3.4.0</spring-boot-3.version>
+    <spring-6.version>6.2.1</spring-6.version>
+    <spring-boot-3.version>3.4.1</spring-boot-3.version>
 
     <protobuf-protoc_version>3.22.3</protobuf-protoc_version>
     <grpc_version>1.54.0</grpc_version>
@@ -1096,7 +1096,7 @@
     <profile>
       <id>spring-boot-3</id>
       <properties>
-        <tomcat.version>10.1.31</tomcat.version>
+        <tomcat.version>10.1.34</tomcat.version>
       </properties>
       <dependencyManagement>
         <dependencies>