Skip to content

Commit 8ea7d44

Browse files
authored
Merge branch '3.3' into dependabot/maven/org.apache.commons-commons-exec-1.5.0
2 parents 5be1881 + 98e5789 commit 8ea7d44

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<skip_maven_deploy>true</skip_maven_deploy>
4040
<spring-boot.version>2.7.18</spring-boot.version>
4141
<spring-boot-maven-plugin.version>2.7.18</spring-boot-maven-plugin.version>
42-
<micrometer-core.version>1.14.6</micrometer-core.version>
42+
<micrometer-core.version>1.15.0</micrometer-core.version>
4343
</properties>
4444

4545
<dependencyManagement>

dubbo-dependencies-bom/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@
122122
<snakeyaml_version>2.4</snakeyaml_version>
123123
<commons_lang3_version>3.17.0</commons_lang3_version>
124124
<envoy_api_version>0.1.35</envoy_api_version>
125-
<micrometer.version>1.14.6</micrometer.version>
125+
<micrometer.version>1.15.0</micrometer.version>
126126
<opentelemetry.version>1.50.0</opentelemetry.version>
127127
<zipkin-reporter.version>3.5.0</zipkin-reporter.version>
128128
<zipkin.version>3.5.1</zipkin.version>
129129
<micrometer-tracing.version>1.4.5</micrometer-tracing.version>
130130
<t_digest.version>3.3</t_digest.version>
131131
<prometheus_client.version>0.16.0</prometheus_client.version>
132132
<reactive.version>1.0.4</reactive.version>
133-
<reactor.version>3.7.5</reactor.version>
133+
<reactor.version>3.7.6</reactor.version>
134134
<rxjava.version>2.2.21</rxjava.version>
135135
<okhttp_version>3.14.9</okhttp_version>
136136

@@ -169,7 +169,7 @@
169169
<activation_version>1.2.0</activation_version>
170170
<test_container_version>1.21.0</test_container_version>
171171
<hessian_lite_version>4.0.3</hessian_lite_version>
172-
<swagger_version>1.6.15</swagger_version>
172+
<swagger_version>1.6.16</swagger_version>
173173

174174
<snappy_java_version>1.1.10.7</snappy_java_version>
175175
<bouncycastle-bcprov_version>1.70</bouncycastle-bcprov_version>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<artifactId>dubbo-rest-openapi</artifactId>
2828

2929
<properties>
30-
<swagger-annotations.version>2.2.30</swagger-annotations.version>
30+
<swagger-annotations.version>2.2.32</swagger-annotations.version>
3131
<swagger-ui.version>5.21.0</swagger-ui.version>
3232
<redoc.version>2.2.0</redoc.version>
3333
<webjars-locator.version>1.0.1</webjars-locator.version>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<maven_gmavenplus_version>3.0.2</maven_gmavenplus_version>
165165

166166
<!-- For unify spring boot 3 version -->
167-
<spring-6.version>6.2.6</spring-6.version>
167+
<spring-6.version>6.2.7</spring-6.version>
168168
<spring-boot-3.version>3.4.5</spring-boot-3.version>
169169

170170
<protobuf-protoc_version>3.22.3</protobuf-protoc_version>
@@ -1067,7 +1067,7 @@
10671067
<profile>
10681068
<id>spring-boot-3</id>
10691069
<properties>
1070-
<tomcat.version>10.1.40</tomcat.version>
1070+
<tomcat.version>10.1.41</tomcat.version>
10711071
</properties>
10721072
<dependencyManagement>
10731073
<dependencies>

0 commit comments

Comments
 (0)