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

# Conflicts: # dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
apache · Sep 22, 2024 · 6a79d79 · 6a79d79
2 parents 1ef0d38 + 67d3753
commit 6a79d79
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 16 deletions.
diff --git a/dubbo-config/dubbo-config-spring6/pom.xml b/dubbo-config/dubbo-config-spring6/pom.xml
@@ -28,7 +28,7 @@
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <spring.version>6.0.19</spring.version>
+    <spring.version>6.1.13</spring.version>
     <spring-boot.version>3.0.9</spring-boot.version>
   </properties>
 

diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml
@@ -199,7 +199,7 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>0.10.2</version>
+            <version>0.10.3</version>
             <configuration>
               <classesDirectory>${project.build.outputDirectory}</classesDirectory>
               <metadataRepository>

diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml
@@ -199,7 +199,7 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>0.10.2</version>
+            <version>0.10.3</version>
             <configuration>
               <classesDirectory>${project.build.outputDirectory}</classesDirectory>
               <metadataRepository>

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
@@ -105,7 +105,7 @@
     <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.4</protobuf-java_version>
+    <protobuf-java_version>3.25.5</protobuf-java_version>
     <javax_annotation-api_version>1.3.2</javax_annotation-api_version>
     <servlet_version>3.1.0</servlet_version>
     <jakarta_servlet_version>6.1.0</jakarta_servlet_version>
@@ -120,14 +120,14 @@
     <snakeyaml_version>2.3</snakeyaml_version>
     <commons_lang3_version>3.17.0</commons_lang3_version>
     <envoy_api_version>0.1.35</envoy_api_version>
-    <micrometer.version>1.13.3</micrometer.version>
+    <micrometer.version>1.13.4</micrometer.version>
     <opentelemetry.version>1.39.0</opentelemetry.version>
     <zipkin-reporter.version>3.4.0</zipkin-reporter.version>
     <micrometer-tracing.version>1.3.3</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.6.9</reactor.version>
+    <reactor.version>3.6.10</reactor.version>
     <rxjava.version>2.2.21</rxjava.version>
     <okhttp_version>3.14.9</okhttp_version>
 
@@ -169,7 +169,7 @@
     <hessian_lite_version>4.0.3</hessian_lite_version>
     <swagger_version>1.6.14</swagger_version>
 
-    <snappy_java_version>1.1.10.6</snappy_java_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>
@@ -184,7 +184,7 @@
     <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
     <open_feign_version>3.1.5</open_feign_version>
-    <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.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>
 
     <revision>3.3.1-SNAPSHOT</revision>

diff --git a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml
@@ -28,13 +28,6 @@
   <packaging>jar</packaging>
   <description>Apache Dubbo Spring Boot Auto-Configure</description>
 
-  <properties>
-    <micrometer.version>1.13.3</micrometer.version>
-    <micrometer-tracing.version>1.3.3</micrometer-tracing.version>
-    <opentelemetry.version>1.42.0</opentelemetry.version>
-    <zipkin-reporter.version>3.4.0</zipkin-reporter.version>
-    <prometheus-client.version>0.16.0</prometheus-client.version>
-  </properties>
   <dependencies>
 
     <!-- Spring Boot Auto-Configuration -->

diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml
@@ -43,7 +43,7 @@
     <!-- Spring boot buddy is lower than the delivery dependency package version and can only show the defined dependency version -->
     <byte-buddy.version>1.15.1</byte-buddy.version>
     <mockito_version>4.11.0</mockito_version>
-    <micrometer.version>1.13.3</micrometer.version>
+    <micrometer.version>1.13.4</micrometer.version>
     <micrometer-tracing.version>1.3.3</micrometer-tracing.version>
     <opentelemetry.version>1.42.0</opentelemetry.version>
     <zipkin-reporter.version>3.4.0</zipkin-reporter.version>