Skip to content

Commit

Permalink
Merge branch '3.3' into openapi
Browse files Browse the repository at this point in the history
  • Loading branch information
oxsean authored Nov 23, 2024
2 parents 9ed4b54 + c0b1d49 commit 19ba414
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dubbo-demo/dubbo-demo-spring-boot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.6</micrometer-core.version>
<micrometer-core.version>1.14.1</micrometer-core.version>
</properties>

<dependencyManagement>
Expand Down
6 changes: 3 additions & 3 deletions dubbo-dependencies-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<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>
<netty4_version>4.1.114.Final</netty4_version>
<netty4_version>4.1.115.Final</netty4_version>
<netty_http3_version>0.0.28.Final</netty_http3_version>
<httpclient_version>4.5.14</httpclient_version>
<httpcore_version>4.4.16</httpcore_version>
Expand Down Expand Up @@ -125,11 +125,11 @@
<micrometer.version>1.13.6</micrometer.version>
<opentelemetry.version>1.44.1</opentelemetry.version>
<zipkin-reporter.version>3.4.2</zipkin-reporter.version>
<micrometer-tracing.version>1.3.5</micrometer-tracing.version>
<micrometer-tracing.version>1.4.0</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.11</reactor.version>
<reactor.version>3.7.0</reactor.version>
<rxjava.version>2.2.21</rxjava.version>
<okhttp_version>3.14.9</okhttp_version>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
<maven_gmavenplus.version>3.0.2</maven_gmavenplus.version>

<!-- For unify spring boot 3 version -->
<spring-6.version>6.1.14</spring-6.version>
<spring-6.version>6.2.0</spring-6.version>
<spring-boot-3.version>3.3.5</spring-boot-3.version>

<protobuf-protoc_version>3.22.3</protobuf-protoc_version>
Expand Down

0 comments on commit 19ba414

Please sign in to comment.