This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit e9ea101657f0fb4a02b46ba627170bfb1bfc201f Merge: 42cd91d8cd bc55100c9e Author: Albumen Kevin <[email protected]> AuthorDate: Wed Feb 8 15:11:46 2023 +0800 Merge branch 'apache-3.1' into apache-3.2 # Conflicts: # dubbo-dependencies-bom/pom.xml # dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/CacheableFailbackRegistry.java dubbo-dependencies-bom/pom.xml | 2 +- .../metadata/MetadataServiceNameMapping.java | 4 +-- .../support/CacheableFailbackRegistry.java | 35 ++++++++-------------- 3 files changed, 16 insertions(+), 25 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index cd61c05e1c,3fea871453..9fe7694589 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -91,15 -91,14 +91,15 @@@ <properties> <!-- Common libs --> <!-- <spring_version>4.3.30.RELEASE</spring_version> --> - <spring_version>5.2.20.RELEASE</spring_version> - <javassist_version>3.28.0-GA</javassist_version> - <netty_version>3.2.5.Final</netty_version> + <spring_version>5.3.25</spring_version> + <javassist_version>3.29.2-GA</javassist_version> + <bytebuddy.version>1.12.22</bytebuddy.version> + <netty_version>3.2.10.Final</netty_version> - <netty4_version>4.1.72.Final</netty4_version> + <netty4_version>4.1.87.Final</netty4_version> - <mina_version>2.1.5</mina_version> + <mina_version>2.2.1</mina_version> <grizzly_version>2.4.4</grizzly_version> - <httpclient_version>4.5.13</httpclient_version> - <httpcore_version>4.4.6</httpcore_version> + <httpclient_version>4.5.14</httpclient_version> + <httpcore_version>4.4.16</httpcore_version> <fastjson_version>1.2.83</fastjson_version> <fastjson2_version>2.0.23</fastjson2_version> <zookeeper_version>3.4.14</zookeeper_version> diff --cc dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/CacheableFailbackRegistry.java index fb77e17d62,b423691b73..84e1501758 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/CacheableFailbackRegistry.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/CacheableFailbackRegistry.java @@@ -62,10 -60,8 +61,9 @@@ import static org.apache.dubbo.common.c import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_EMPTY_ADDRESS; import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_FAILED_CLEAR_CACHED_URLS; import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_FAILED_URL_EVICTING; - import static org.apache.dubbo.common.constants.LoggerCodeConstants.COMMON_PROPERTY_TYPE_MISMATCH; import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_NO_PARAMETERS_URL; import static org.apache.dubbo.common.constants.RegistryConstants.CATEGORY_KEY; +import static org.apache.dubbo.common.constants.RegistryConstants.DEFAULT_ENABLE_EMPTY_PROTECTION; import static org.apache.dubbo.common.constants.RegistryConstants.EMPTY_PROTOCOL; import static org.apache.dubbo.common.constants.RegistryConstants.ENABLE_EMPTY_PROTECTION_KEY; import static org.apache.dubbo.common.constants.RegistryConstants.PROVIDERS_CATEGORY;
