Skip to content

Commit 012d256

Browse files
wangshishuifeng2022wangshishuifeng2022
authored
Merge pull request apache#1 from apache/master
合并最新的dubbo
2 parents 045116c + 8acd17c commit 012d256

File tree

1,287 files changed

+58339
-25117
lines changed

Some content is hidden

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

1,287 files changed

+58339
-25117
lines changed

‎.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/*

‎CHANGES.md‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,57 @@
11
# Release Notes
22

3+
## 2.7.4.1
4+
5+
### Enhancement
6+
7+
* Enhance ProtobufTypeBuilder support generate type definition which contains Bytes List or Bytes Map. #5083
8+
* Using the ID of Dubbo Config as the alias of Bean. #5094
9+
* tag router supports anyhost. #4431
10+
* optimize generic invoke. #4076
11+
* dubbo zookeeper registry too slow #4828
12+
* use consul with group and version. #4755
13+
* qos support host config. #4720
14+
* migrate http protocol #4781
15+
* Some unit test optimization. #5026 #4803 #4687
16+
17+
### Bugfixes
18+
19+
* Apollo namespace optimization. #5105
20+
* Simplify dubbo-common transitive dependencies. #5107
21+
* Delete 'config.' prefix for url generated from ConfigCenterConfig. #5001
22+
* fix set generic method error. #5079
23+
* Add support for overriding Map properties in AbstractConfig.refresh. #4882
24+
* Fix travis javax.ex dependency issue. (unit test)
25+
* Fix: ExtensionLoader load duplicate filter，no log or exception. #4340
26+
* When the provider interrupts abnormally, the consumer cannot return quickly and still waits for the timeout to end. #4694
27+
* Fix register config not take effect because of url simplified。 #4397
28+
* Don't support metadata for generic service. #4641
29+
* Avoid resize in ClassUtils.java. #5009
30+
* default attribute in <dubbo:registry> doesn't work as expected. #4412
31+
* make RegistryDirectory can refresh the invokers when providers number become 0 when using nacos registry. #4793
32+
* Multiple @Reference annotations only have one effect #4674
33+
* Fix RpcContext.getContext().getRemoteApplicationName() returns null #4351
34+
* Security issue: upgrade fastjson version to 1.2.60. #5018
35+
* nacos-registry:serviceName split error #4974
36+
* AbstractConfig.java-getMetaData set default depend on getmethod sequence #4678
37+
* fix protocol register set false not work. #4776
38+
* Fix: In Rest protocol, the limitation of Dubbo-Attachments. #4898
39+
* The logic of org.apache.dubbo.config.MonitorConfig#isValid is incorrect #4892
40+
* protostuff return stackoverflow and other error msg #4861
41+
* fix method parameter bean generation. #3796
42+
* replace hardcode with regex pattern #4810
43+
* Fix warm up issue when provider's timestamp is bigger than local machine's timestamp. #4870
44+
* Fix use generic invocation via API , lost #4238 ion" value #4784
45+
* In consumer side the app cannot catch the exception from provider that is configured serialization="kryo". #4238
46+
* fix StringUtils#isBlank #4725
47+
* when the interfaceName of the Reference annotation has duplicated,the exception is puzzled #4160
48+
* when anonymity bean is defined in spirng context，dubbo throw npe #
49+
* add Thread ContextClassLoader #4712
50+
* Fix judgment ipv4 address #4729
51+
* The compilation of static methods should be excluded when generating the proxy. #4647
52+
* check EOF of inputstream in IOUtils.write #4648
53+
54+
355
## 2.7.3
456

557
### Change List

‎LICENSE‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,23 @@ This product contains a modified portion of 'Netty', an event-driven asynchronou
222222

223223
For the org.apache.dubbo.common.utils.CIDRUtils :
224224

225-
This product contains a modified portion of 'edazdarevic.commons.net.CIDRUtils',
226-
under a "MIT License" license, see https://github.com/edazdarevic/CIDRUtils/blob/master/CIDRUtils.java
227-
225+
This product contains a modified portion of 'edazdarevic.commons.net.CIDRUtils' published at
226+
https://github.com/edazdarevic/CIDRUtils. The project is licensed under a MIT License:
227+
* The MIT License
228+
*
229+
* Copyright (c) 2013 Edin Dazdarevic (edin.dazdarevic@gmail.com)
230+
* Permission is hereby granted, free of charge, to any person obtaining a copy
231+
* of this software and associated documentation files (the "Software"), to deal
232+
* in the Software without restriction, including without limitation the rights
233+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
234+
* copies of the Software, and to permit persons to whom the Software is
235+
* furnished to do so, subject to the following conditions:
236+
* The above copyright notice and this permission notice shall be included in
237+
* all copies or substantial portions of the Software.
238+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
239+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
240+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
241+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
242+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
243+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
244+
* THE SOFTWARE.

‎NOTICE‎

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

1414
Copyright 2014 The Netty Project
15+

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ There's a [README](https://github.com/apache/dubbo-samples/tree/master/dubbo-sam
4444

4545
```xml
4646
<properties>
47-
<dubbo.version>2.7.3</dubbo.version>
47+
<dubbo.version>2.7.4.1</dubbo.version>
4848
</properties>
4949

5050
<dependencies>
@@ -221,11 +221,12 @@ Please report security vulnerability to [us](mailto:security@dubbo.apache.org) p
221221

222222
## Dubbo ecosystem
223223

224-
* [Dubbo Ecosystem Entry](https://github.com/dubbo) - A GitHub group `dubbo` to gather all Dubbo relevant projects not appropriate in [apache](https://github.com/apache) group yet
224+
* [Dubbo Ecosystem Entry](https://github.com/apache?utf8=%E2%9C%93&q=dubbo&type=&language=) - A GitHub group `dubbo` to gather all Dubbo relevant projects not appropriate in [apache](https://github.com/apache) group yet
225225
* [Dubbo Website](https://github.com/apache/dubbo-website) - Apache Dubbo official website
226226
* [Dubbo Samples](https://github.com/apache/dubbo-samples) - samples for Apache Dubbo
227227
* [Dubbo Spring Boot](https://github.com/apache/dubbo-spring-boot-project) - Spring Boot Project for Dubbo
228228
* [Dubbo Admin](https://github.com/apache/dubbo-admin) - The reference implementation for Dubbo admin
229+
* [Dubbo Awesome](https://github.com/apache/dubbo-awesome) - Dubbo's slides and video links in Meetup
229230

230231
#### Language
231232

‎codestyle/checkstyle.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@
2222
<module name="UnusedImports"/>
2323
<module name="RedundantImport"/>
2424

25+
<module name="EqualsHashCode"/>
26+
2527
<!--<module name="CustomImportOrder">-->
2628
<!--<property name="specialImportsRegExp" value="org.apache.dubbo.*"/>-->
2729
<!--<property name="sortImportsInGroupAlphabetically" value="false"/>-->
2830
<!--<property name="customImportOrderRules" value="SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###STATIC"/>-->
2931
<!--</module>-->
3032
</module>
31-
</module>
33+
</module>

‎compiler/pom.xml‎

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one or more
3+
contributor license agreements. See the NOTICE file distributed with
4+
this work for additional information regarding copyright ownership.
5+
The ASF licenses this file to You under the Apache License, Version 2.0
6+
(the "License"); you may not use this file except in compliance with
7+
the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
<parent>
22+
<groupId>org.apache</groupId>
23+
<artifactId>apache</artifactId>
24+
<version>21</version>
25+
</parent>
26+
27+
<groupId>org.apache.dubbo</groupId>
28+
<artifactId>dubbo-compiler</artifactId>
29+
<version>0.0.1-SNAPSHOT</version>
30+
31+
<packaging>jar</packaging>
32+
33+
<properties>
34+
<maven_compiler_version>3.6.0</maven_compiler_version>
35+
<maven_jar_version>3.0.2</maven_jar_version>
36+
<java_source_version>1.8</java_source_version>
37+
<java_target_version>1.8</java_target_version>
38+
<file_encoding>UTF-8</file_encoding>
39+
</properties>
40+
41+
<dependencies>
42+
<dependency>
43+
<groupId>com.salesforce.servicelibs</groupId>
44+
<artifactId>grpc-contrib</artifactId>
45+
<version>0.8.1</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>com.salesforce.servicelibs</groupId>
49+
<artifactId>jprotoc</artifactId>
50+
<version>0.9.1</version>
51+
</dependency>
52+
</dependencies>
53+
54+
<build>
55+
<plugins>
56+
<plugin>
57+
<groupId>org.apache.maven.plugins</groupId>
58+
<artifactId>maven-compiler-plugin</artifactId>
59+
<version>${maven_compiler_version}</version>
60+
<configuration>
61+
<compilerArgument>-proc:none</compilerArgument>
62+
<fork>true</fork>
63+
<source>${java_source_version}</source>
64+
<target>${java_target_version}</target>
65+
<encoding>${file_encoding}</encoding>
66+
</configuration>
67+
</plugin>
68+
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-jar-plugin</artifactId>
72+
<version>${maven_jar_version}</version>
73+
<configuration>
74+
<archive>
75+
<manifest>
76+
<addClasspath>true</addClasspath>
77+
<mainClass>org.apache.dubbo.gen.grpc.DubboGrpcGenerator</mainClass>
78+
</manifest>
79+
</archive>
80+
</configuration>
81+
</plugin>
82+
83+
<!-- Optional, used to build directly executable packages (without using 'java -jar'),
84+
for example 'artifactId-1.0.0-osx-x86_64.exe', 'artifactId-1.0.0-osx-x86_64.exe' -->
85+
<plugin>
86+
<groupId>com.salesforce.servicelibs</groupId>
87+
<artifactId>canteen-maven-plugin</artifactId>
88+
<version>1.0.0</version>
89+
<executions>
90+
<execution>
91+
<goals>
92+
<goal>bootstrap</goal>
93+
</goals>
94+
</execution>
95+
</executions>
96+
</plugin>
97+
</plugins>
98+
</build>
99+
100+
<profiles>
101+
<profile>
102+
<id>release</id>
103+
<build>
104+
<plugins>
105+
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
107+
<artifactId>maven-gpg-plugin</artifactId>
108+
<executions>
109+
<execution>
110+
<phase>verify</phase>
111+
<goals>
112+
<goal>sign</goal>
113+
</goals>
114+
</execution>
115+
</executions>
116+
</plugin>
117+
</plugins>
118+
</build>
119+
</profile>
120+
</profiles>
121+
122+
<name>dubbo-compiler</name>
123+
<description>Dubbo customized RPC stub compiler.</description>
124+
<url>https://github.com/apache/dubbo</url>
125+
<inceptionYear>2011</inceptionYear>
126+
<licenses>
127+
<license>
128+
<name>Apache License, Version 2.0</name>
129+
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
130+
<distribution>repo</distribution>
131+
</license>
132+
</licenses>
133+
134+
<scm>
135+
<url>https://github.com/apache/dubbo</url>
136+
<connection>scm:git:https://github.com/apache/dubbo.git</connection>
137+
<developerConnection>scm:git:https://github.com/apache/dubbo.git</developerConnection>
138+
<tag>HEAD</tag>
139+
</scm>
140+
<mailingLists>
141+
<mailingList>
142+
<name>Development List</name>
143+
<subscribe>dev-subscribe@dubbo.apache.org</subscribe>
144+
<unsubscribe>dev-unsubscribe@dubbo.apache.org</unsubscribe>
145+
<post>dev@dubbo.apache.org</post>
146+
</mailingList>
147+
<mailingList>
148+
<name>Commits List</name>
149+
<subscribe>commits-subscribe@dubbo.apache.org</subscribe>
150+
<unsubscribe>commits-unsubscribe@dubbo.apache.org</unsubscribe>
151+
<post>commits@dubbo.apache.org</post>
152+
</mailingList>
153+
<mailingList>
154+
<name>Issues List</name>
155+
<subscribe>issues-subscribe@dubbo.apache.org</subscribe>
156+
<unsubscribe>issues-unsubscribe@dubbo.apache.org</unsubscribe>
157+
<post>issues@dubbo.apache.org</post>
158+
</mailingList>
159+
</mailingLists>
160+
<developers>
161+
<developer>
162+
<id>dubbo.io</id>
163+
<name>The Dubbo Project Contributors</name>
164+
<email>dev-subscribe@dubbo.apache.org</email>
165+
<url>http://dubbo.apache.org/</url>
166+
</developer>
167+
</developers>
168+
169+
<organization>
170+
<name>The Apache Software Foundation</name>
171+
<url>http://www.apache.org/</url>
172+
</organization>
173+
174+
<issueManagement>
175+
<system>Github Issues</system>
176+
<url>https://github.com/apache/dubbo/issues</url>
177+
</issueManagement>
178+
</project>

0 commit comments

Comments
 (0)
⚡