Skip to content

Commit 39f84fe

Browse files
chickenljchickenlj
committed
Merge branch 'master-merged-performance-cloudnative'
# Conflicts: # dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java # dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/util/ClassUtils.java # dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java # dubbo-common/pom.xml # dubbo-common/src/main/java/org/apache/dubbo/common/URL.java # dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/Constants.java # dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java # dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java # dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java # dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java # dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java # dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java # dubbo-common/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java # dubbo-common/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java # dubbo-common/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java # dubbo-common/src/main/java/org/apache/dubbo/config/Constants.java # dubbo-common/src/main/java/org/apache/dubbo/rpc/support/ProtocolUtils.java # dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java # dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java # dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractReferenceConfigTest.java # dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java # dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java # dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/builders/AbstractReferenceBuilderTest.java # dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/builders/AbstractServiceBuilderTest.java # dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java # dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java # dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-etcd/src/main/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java # dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/integration/MetadataReportServiceTest.java # dubbo-metadata-report/dubbo-metadata-report-etcd/src/test/java/org/apache/dubbo/metadata/store/etcd/EtcdMetadataReportTest.java # dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java # dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClientHandler.java # dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServerHandler.java # dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java # dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java # dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java # dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java # dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/interceptors/ConsumerContextClusterInterceptor.java # dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/service/GenericServiceTest.java # dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java # dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RpcContextFilter.java # dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java # pom.xml
2 parents 7e82c56 + 6d3bbb0 commit 39f84fe

1,298 files changed

Lines changed: 52595 additions & 29324 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ target/
66
*.zip
77
*.tar
88
*.tar.gz
9+
.flattened-pom.xml
910

1011
# eclipse ignore
1112
.settings/
@@ -35,3 +36,11 @@ Thumbs.db
3536

3637
# license check result
3738
license-list
39+
40+
# grpc compiler
41+
compiler/gradle.properties
42+
compiler/build/*
43+
compiler/.gradle/*
44+
45+
# protobuf
46+
dubbo-serialization/dubbo-serialization-protobuf/build/*

‎LICENSE‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,6 @@ https://github.com/edazdarevic/CIDRUtils. The project is licensed under a MIT Li
243243
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
244244
* THE SOFTWARE.
245245

246+
This product contains a modified portion of 'proto-gen-grpc-java' - a protobuf plugin used to generate grpc-java stubs,
247+
under a "Apache License 2.0" license, see https://github.com/grpc/grpc-java/blob/v1.22.1/NOTICE.txt. All files are placed
248+
under '/dubbo/compiler'

‎NOTICE‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,13 @@ Please visit the Netty web site for more information:
1212
* http://netty.io/
1313

1414
Copyright 2014 The Netty Project
15+
16+
17+
This product contains code for the gRPC Project:
18+
19+
The gRPC Project
20+
=================
21+
Please visit the gRPC web site for more information:
22+
* http://grpc.io/
23+
24+
Copyright 2014 The gRPC Project

‎compiler/.gradle/4.3/fileChanges/last-build.bin‎

1 Byte
Binary file not shown.

‎compiler/.gradle/4.3/fileContent/annotation-processors.bin‎

19.3 KB
Binary file not shown.

‎compiler/.gradle/4.3/fileContent/fileContent.lock‎

17 Bytes
Binary file not shown.

‎compiler/.gradle/4.3/fileHashes/fileHashes.bin‎

511 KB
Binary file not shown.

‎compiler/.gradle/4.3/fileHashes/fileHashes.lock‎

17 Bytes
Binary file not shown.

‎compiler/.gradle/4.3/fileHashes/resourceHashesCache.bin‎

189 KB
Binary file not shown.

‎compiler/.gradle/4.3/nativeCompile/nativeCompile.bin‎

18.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)