Skip to content

Commit

Permalink
Merge branch '3.2' into dependabot/maven/org.junit.platform-junit-pla…
Browse files Browse the repository at this point in the history
…tform-launcher-1.11.0
  • Loading branch information
AlbumenJ committed Aug 21, 2024
2 parents 8b6bc16 + 05cb55a commit 9509c70
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion dubbo-configcenter/dubbo-configcenter-apollo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<description>The Apollo implementation of the configcenter api</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
<apollo_mock_server_version>2.2.0</apollo_mock_server_version>
<apollo_mock_server_version>2.3.0</apollo_mock_server_version>
</properties>

<dependencies>
Expand Down
8 changes: 4 additions & 4 deletions dubbo-dependencies-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<properties>
<!-- Common libs -->
<!-- <spring_version>4.3.30.RELEASE</spring_version> -->
<spring_version>5.3.37</spring_version>
<spring_version>5.3.39</spring_version>
<spring_security_version>5.8.13</spring_security_version>
<javassist_version>3.30.2-GA</javassist_version>
<bytebuddy.version>1.14.18</bytebuddy.version>
Expand All @@ -115,17 +115,17 @@
<hibernate_validator_new_version>7.0.5.Final</hibernate_validator_new_version>
<jel_version>3.0.1-b12</jel_version>
<jcache_version>1.1.1</jcache_version>
<apollo_client_version>2.2.0</apollo_client_version>
<apollo_client_version>2.3.0</apollo_client_version>
<snakeyaml_version>2.2</snakeyaml_version>
<commons_lang3_version>3.16.0</commons_lang3_version>
<envoy_api_version>0.1.35</envoy_api_version>
<micrometer.version>1.13.2</micrometer.version>
<micrometer.version>1.13.3</micrometer.version>

<micrometer-tracing.version>1.3.2</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.8</reactor.version>
<reactor.version>3.6.9</reactor.version>
<rxjava.version>2.2.21</rxjava.version>
<okhttp_version>3.14.9</okhttp_version>

Expand Down
4 changes: 2 additions & 2 deletions dubbo-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.13.1</version>
<version>3.14.0</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -74,7 +74,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.13.1</version>
<version>3.14.0</version>
<configuration>
<goalPrefix>dubbo</goalPrefix>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions dubbo-native-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.13.1</version>
<version>3.14.0</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -77,7 +77,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.13.1</version>
<version>3.14.0</version>
<configuration>
<goalPrefix>dubbo</goalPrefix>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</modules>

<properties>
<micrometer.version>1.13.2</micrometer.version>
<micrometer.version>1.13.3</micrometer.version>
<micrometer-tracing.version>1.3.2</micrometer-tracing.version>
<opentelemetry.version>1.41.0</opentelemetry.version>
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-spring-boot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
<log4j2_version>2.23.1</log4j2_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.18</byte-buddy.version>
<byte-buddy.version>1.14.19</byte-buddy.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-test/dubbo-test-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
<slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
<spring_version>5.3.37</spring_version>
<spring_version>5.3.39</spring_version>
<!--<spring_version>4.0.9.RELEASE</spring_version>-->
<!--<spring_version>4.1.9.RELEASE</spring_version>-->
<!--<spring_version>4.2.4.RELEASE</spring_version>-->
Expand Down
2 changes: 1 addition & 1 deletion dubbo-test/dubbo-test-spring3.2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<properties>
<skip_maven_deploy>true</skip_maven_deploy>
<spring_version>5.3.37</spring_version>
<spring_version>5.3.39</spring_version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-test/dubbo-test-spring4.1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<properties>
<skip_maven_deploy>true</skip_maven_deploy>
<spring_version>5.3.37</spring_version>
<spring_version>5.3.39</spring_version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-test/dubbo-test-spring4.2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<properties>
<skip_maven_deploy>true</skip_maven_deploy>
<spring_version>5.3.37</spring_version>
<spring_version>5.3.39</spring_version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<!-- Maven plugins -->
<maven_jar_version>3.4.2</maven_jar_version>
<maven_surefire_version>3.3.1</maven_surefire_version>
<maven_failsafe_version>3.3.1</maven_failsafe_version>
<maven_failsafe_version>3.4.0</maven_failsafe_version>
<maven_deploy_version>3.1.2</maven_deploy_version>
<maven_compiler_version>3.13.0</maven_compiler_version>
<maven_source_version>3.3.1</maven_source_version>
Expand Down

0 comments on commit 9509c70

Please sign in to comment.