You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/07/26 01:57:39 UTC
[dubbo] branch 3.0 updated: Dependencies Upgrade (#8351)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 3f3cea7 Dependencies Upgrade (#8351)
3f3cea7 is described below
commit 3f3cea771e158c443ea3c3d7ef2c94f8a982ae35
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Jul 26 09:57:30 2021 +0800
Dependencies Upgrade (#8351)
* Dependencies Upgrade
* fix ut
* update nacos version
* remove eclipse-collections dependency
* fix compile error
* revert 401c56e6
* exclude guava
* fix test compile
---
dubbo-common/pom.xml | 4 ----
.../java/org/apache/dubbo/common/URLStrParser.java | 7 +++---
dubbo-config/dubbo-config-api/pom.xml | 6 +++++
.../factory/config/YamlPropertySourceFactory.java | 19 ++++++++--------
dubbo-dependencies-bom/pom.xml | 26 ++++++----------------
dubbo-distribution/dubbo-all/pom.xml | 4 ----
.../registry/client/DefaultServiceInstance.java | 3 +--
.../client/ServiceDiscoveryRegistryDirectory.java | 4 +---
8 files changed, 27 insertions(+), 46 deletions(-)
diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml
index bc46ec4..0e8be69 100644
--- a/dubbo-common/pom.xml
+++ b/dubbo-common/pom.xml
@@ -77,10 +77,6 @@
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.collections</groupId>
- <artifactId>eclipse-collections</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<scope>test</scope>
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/URLStrParser.java b/dubbo-common/src/main/java/org/apache/dubbo/common/URLStrParser.java
index 1b45b1f..55ca88d 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/URLStrParser.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/URLStrParser.java
@@ -21,9 +21,8 @@ import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.url.component.ServiceConfigURL;
import org.apache.dubbo.common.url.component.URLItemCache;
-import org.eclipse.collections.impl.map.mutable.UnifiedMap;
-
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY_PREFIX;
@@ -74,7 +73,7 @@ public final class URLStrParser {
}
TempBuf tempBuf = DECODE_TEMP_BUF.get();
- Map<String, String> params = new UnifiedMap<>();
+ Map<String, String> params = new HashMap<>();
int nameStart = from;
int valueStart = -1;
int i;
@@ -240,7 +239,7 @@ public final class URLStrParser {
}
TempBuf tempBuf = DECODE_TEMP_BUF.get();
- Map<String, String> params = new UnifiedMap<>();
+ Map<String, String> params = new HashMap<>();
int nameStart = from;
int valueStart = -1;
int i;
diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml
index 501d365..665d14d 100644
--- a/dubbo-config/dubbo-config-api/pom.xml
+++ b/dubbo-config/dubbo-config-api/pom.xml
@@ -164,6 +164,12 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java
index 229764f..2b18644 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java
@@ -16,19 +16,11 @@
*/
package org.apache.dubbo.config.spring.beans.factory.config;
-import java.io.IOException;
-import java.util.AbstractMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
import org.springframework.beans.factory.config.YamlProcessor;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.core.io.support.EncodedResource;
import org.springframework.core.io.support.PropertySourceFactory;
-
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@@ -38,6 +30,13 @@ import org.yaml.snakeyaml.parser.ParserException;
import org.yaml.snakeyaml.representer.Representer;
import org.yaml.snakeyaml.resolver.Resolver;
+import java.io.IOException;
+import java.util.AbstractMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
/**
* YAML {@link PropertySourceFactory} implementation, some source code is copied Spring Boot
* org.springframework.boot.env.YamlPropertySourceLoader , see {@link #createYaml()} and {@link #process()}
@@ -66,8 +65,8 @@ public class YamlPropertySourceFactory extends YamlProcessor implements Property
}
@Override
- protected Map<Object, Object> createDefaultMap() {
- final Map<Object, Object> delegate = super.createDefaultMap();
+ protected Map<Object, Object> createDefaultMap(int initSize) {
+ final Map<Object, Object> delegate = super.createDefaultMap(initSize);
return new AbstractMap<Object, Object>() {
@Override
public Object put(Object key, Object value) {
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index a0af80b..25e16ab 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -92,12 +92,11 @@
<!-- <spring_version>4.3.30.RELEASE</spring_version> -->
<spring_version>5.2.8.RELEASE</spring_version>
<javassist_version>3.23.1-GA</javassist_version>
- <eclipse_collections_version>10.4.0</eclipse_collections_version>
<netty_version>3.2.5.Final</netty_version>
<netty4_version>4.1.56.Final</netty4_version>
<mina_version>1.1.7</mina_version>
<grizzly_version>2.4.4</grizzly_version>
- <httpclient_version>4.5.3</httpclient_version>
+ <httpclient_version>4.5.13</httpclient_version>
<httpcore_version>4.4.6</httpcore_version>
<fastjson_version>1.2.70</fastjson_version>
<zookeeper_version>3.4.13</zookeeper_version>
@@ -114,7 +113,7 @@
<protobuf-java_version>3.11.0</protobuf-java_version>
<javax_annotation-api_version>1.3.2</javax_annotation-api_version>
<servlet_version>3.1.0</servlet_version>
- <jetty_version>9.4.11.v20180605</jetty_version>
+ <jetty_version>9.4.43.v20210629</jetty_version>
<validation_version>1.1.0.Final</validation_version>
<hibernate_validator_version>5.4.1.Final</hibernate_validator_version>
<jel_version>3.0.1-b08</jel_version>
@@ -123,17 +122,17 @@
<kryo_serializers_version>0.42</kryo_serializers_version>
<fst_version>2.48-jdk-6</fst_version>
<avro_version>1.8.2</avro_version>
- <apollo_client_version>1.1.1</apollo_client_version>
- <snakeyaml_version>1.20</snakeyaml_version>
+ <apollo_client_version>1.8.0</apollo_client_version>
+ <snakeyaml_version>1.29</snakeyaml_version>
<commons_lang3_version>3.8.1</commons_lang3_version>
<protostuff_version>1.5.9</protostuff_version>
<envoy_api_version>0.1.23</envoy_api_version>
<rs_api_version>2.0</rs_api_version>
<resteasy_version>3.0.19.Final</resteasy_version>
- <tomcat_embed_version>8.5.31</tomcat_embed_version>
+ <tomcat_embed_version>8.5.69</tomcat_embed_version>
<jetcd_version>0.5.3</jetcd_version>
- <nacos_version>2.0.0</nacos_version>
+ <nacos_version>2.0.2</nacos_version>
<grpc.version>1.31.1</grpc.version>
<!-- Log libs -->
<slf4j_version>1.7.25</slf4j_version>
@@ -159,7 +158,7 @@
<test_container_version>1.15.3</test_container_version>
<etcd_launcher_version>0.5.3</etcd_launcher_version>
<hessian_lite_version>3.2.8</hessian_lite_version>
- <swagger_version>1.5.19</swagger_version>
+ <swagger_version>1.5.24</swagger_version>
<roaringbitmap_version>0.9.0</roaringbitmap_version>
<bouncycastle-bcprov_version>1.68</bouncycastle-bcprov_version>
@@ -171,7 +170,6 @@
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.1.0</maven_flatten_version>
<revision>3.0.2-SNAPSHOT</revision>
- <guava_version>20.0</guava_version>
</properties>
<dependencyManagement>
@@ -190,11 +188,6 @@
<version>${javassist_version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.collections</groupId>
- <artifactId>eclipse-collections</artifactId>
- <version>${eclipse_collections_version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
<version>${netty_version}</version>
@@ -748,11 +741,6 @@
<scope>test</scope>
<version>${fabric8_kubernetes_version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava_version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml
index dd5f2f3..be8d15d 100644
--- a/dubbo-distribution/dubbo-all/pom.xml
+++ b/dubbo-distribution/dubbo-all/pom.xml
@@ -341,10 +341,6 @@
<artifactId>javassist</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.collections</groupId>
- <artifactId>eclipse-collections</artifactId>
- </dependency>
- <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java
index b4908af..c8a6ffe 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java
@@ -19,7 +19,6 @@ package org.apache.dubbo.registry.client;
import org.apache.dubbo.metadata.MetadataInfo;
import com.alibaba.fastjson.JSON;
-import org.eclipse.collections.impl.map.mutable.UnifiedMap;
import java.util.HashMap;
import java.util.List;
@@ -52,7 +51,7 @@ public class DefaultServiceInstance implements ServiceInstance {
private boolean healthy = true;
- private Map<String, String> metadata = new UnifiedMap<>();
+ private Map<String, String> metadata = new HashMap<>();
private transient String address;
private transient MetadataInfo serviceMetadata;
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
index e96ee4f..3e8a6ae 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
@@ -36,8 +36,6 @@ import org.apache.dubbo.rpc.cluster.Configurator;
import org.apache.dubbo.rpc.cluster.RouterChain;
import org.apache.dubbo.rpc.model.ApplicationModel;
-import org.eclipse.collections.impl.map.mutable.UnifiedMap;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -258,7 +256,7 @@ public class ServiceDiscoveryRegistryDirectory<T> extends DynamicDirectory<T> {
* @return invokers
*/
private Map<String, Invoker<T>> toInvokers(List<URL> urls) {
- Map<String, Invoker<T>> newUrlInvokerMap = new UnifiedMap<>();
+ Map<String, Invoker<T>> newUrlInvokerMap = new HashMap<>();
if (urls == null || urls.isEmpty()) {
return newUrlInvokerMap;
}