Commit Graph

11 Commits

Author SHA1 Message Date
Albumen Kevin 551f820a7e Merge branch 'apache-3.0' into apache-3.1
# Conflicts:
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java
2022-08-15 11:16:43 +08:00
huangjikun 438519cb71
fixed ServiceBeanNameBuilder same version/group conflict (#10454) (#10455)
* fixed ServiceBeanNameBuilder same version/group conflict (#10454)

* fixed ServiceBeanNameBuilder same version/group conflict (#10454)
2022-08-15 09:44:50 +08:00
Albumen Kevin 80561c1925 Merge branch 'apache-3.0' into apache-3.1 2022-07-28 14:07:48 +08:00
Albumen Kevin 7da45152d0
Fix pom revision (#10376) 2022-07-28 11:25:58 +08:00
Albumen Kevin f1af604e7e
Fastjson2 Support (#10166) 2022-07-15 10:18:41 +08:00
Albumen Kevin e554427a1a Merge remote-tracking branch 'apache/3.0.5-release' into apache-3.0
# Conflicts:
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/BitList.java
#	dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ClassLoaderFilter.java
2021-12-27 10:24:09 +08:00
gitchenjh 9492880d26
dubbo-spring-boot-actuator compatible with Spring Boot Actuator 2.6.x (#9394) (#9426) 2021-12-17 14:32:24 +08:00
Pin Xiong dd539ce4b4
fix: Update the version of log4j for bug fixes (#9377) 2021-12-13 10:24:39 +08:00
Albumen Kevin 0e66de1c61
[3.0] Code reformat (#8019)
* convert files, add checker

* rename id

* tab to space

* change git attributes auto convert

* fix end new line

* fix end new line

* fix end new line

* ignore generated files

* override tomcat-embed-core version

* add ignore for codestyle/checkstyle.xml

* add ignore for codestyle/checkstyle.xml

* add rat ignore

* add suppression

* force update

* disable zk dynamic configurator
2021-06-10 20:13:39 +08:00
Gong Dewei d0454fdbef
[3.0] Refactor dubbo config (#7891)
fixes #7574
2021-06-08 16:44:54 +08:00
Albumen Kevin be54ec206a
[Spring Boot Project] Merge 3.0.x Spring-Boot project into Dubbo 3.0.x (#7441)
* [Spring Boot Project] Merge 3.0.x Spring-Boot project into Dubbo 3.0.x

* add junit5 dependency

* ignore ut

* change to junit5

* reset ApplicationModel
2021-04-01 15:28:31 +08:00