Skip to content

Commit c968c09

Browse files
chickenljchickenlj
committed
Fix minor issues reported in 2.6.2 RC1
1 parent b09e7a4 commit c968c09

File tree

4 files changed

+71
-65
lines changed

4 files changed

+71
-65
lines changed

‎CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
3434

3535
## Enforcement
3636

37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
3838

3939
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
4040

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ Our code style is almost in line with the standard java conventions(Popular IDE'
1010

1111
We provide a template file [dubbo_codestyle_for_idea.xml](https://github.com/alibaba/dubbo/tree/master/codestyle/dubbo_codestyle_for_idea.xml) for IntelliJ idea, you can import it to you IDE. If you use Eclipse you can config manually by referencing the same file.
1212

13-
* Make sure all new .java files to have a simple Javadoc class comment with at least an @author tag identifying you, and a @date tag identifying birth, and preferably at least a paragraph on what the class is for.
13+
* Make sure all new .java files to have a simple Javadoc class comment with at least a @date tag identifying birth, and preferably at least a paragraph on what the class is for.
1414

1515
* Add the ASF license header comment to all new .java files (copy from existing files in the project)
1616

17-
* Add yourself as an @author to the .java files that you modify substantially (more than cosmetic changes).
17+
* Make sure no @author tag added to the file you contribute since @author tag is not used at Apache, other ways such as cvs will record all your contributions fairly.
1818

1919
* Add some Javadocs and, if you change the namespace, some XSD doc elements.
2020

‎bom/pom.xml

+34-31
Original file line numberDiff line numberDiff line change
@@ -16,57 +16,60 @@
1616

1717
<name>dubbo-bom</name>
1818
<description>Dubbo dependencies BOM</description>
19-
<url>http://dubbo.io</url>
20-
19+
<url>https://github.com/apache/incubator-dubbo</url>
2120
<inceptionYear>2011</inceptionYear>
2221
<licenses>
2322
<license>
24-
<name>Apache 2</name>
25-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
23+
<name>Apache License, Version 2.0</name>
24+
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
25+
<distribution>repo</distribution>
2626
</license>
2727
</licenses>
2828

29-
<organization>
30-
<name>The Dubbo Project</name>
31-
<url>http://dubbo.io</url>
32-
</organization>
33-
34-
<issueManagement>
35-
<system>Github Issues</system>
36-
<url>https://github.com/alibaba/dubbo/issues</url>
37-
</issueManagement>
3829
<scm>
39-
<url>https://github.com/alibaba/dubbo/tree/master</url>
40-
<connection>scm:git:git://github.com/alibaba/dubbo.git</connection>
41-
<developerConnection>scm:git:git@github.com:alibaba/dubbo.git</developerConnection>
42-
</scm>
30+
<url>https://github.com/apache/incubator-dubbo</url>
31+
<connection>scm:git:https://github.com/apache/incubator-dubbo.git</connection>
32+
<developerConnection>scm:git:https://github.com/apache/incubator-dubbo.git</developerConnection>
33+
</scm>
4334
<mailingLists>
4435
<mailingList>
45-
<name>Dubbo User Mailling List</name>
46-
<subscribe>[email protected]</subscribe>
47-
<unsubscribe>[email protected]</unsubscribe>
48-
<post>[email protected]</post>
49-
<archive>http://groups.google.com/group/dubbo</archive>
36+
<name>Development List</name>
37+
<subscribe>[email protected]</subscribe>
38+
<unsubscribe>[email protected]</unsubscribe>
39+
<post>[email protected]</post>
40+
</mailingList>
41+
<mailingList>
42+
<name>Commits List</name>
43+
<subscribe>[email protected]</subscribe>
44+
<unsubscribe>[email protected]</unsubscribe>
45+
<post>[email protected]</post>
5046
</mailingList>
5147
<mailingList>
52-
<name>Dubbo Developer Mailling List</name>
53-
<subscribe>[email protected]</subscribe>
54-
<unsubscribe>[email protected]</unsubscribe>
55-
<post>[email protected]</post>
56-
<archive>http://groups.google.com/group/dubbo-developers</archive>
48+
<name>Issues List</name>
49+
<subscribe>[email protected]</subscribe>
50+
<unsubscribe>[email protected]</unsubscribe>
51+
<post>[email protected]</post>
5752
</mailingList>
5853
</mailingLists>
5954
<developers>
6055
<developer>
6156
<id>dubbo.io</id>
6257
<name>The Dubbo Project Contributors</name>
63-
<email>[email protected]</email>
64-
<url>http://dubbo.io</url>
65-
<organization>The Dubbo Project</organization>
66-
<organizationUrl>http://dubbo.io</organizationUrl>
58+
<email>[email protected]</email>
59+
<url>http://dubbo.apache.org/</url>
6760
</developer>
6861
</developers>
6962

63+
<organization>
64+
<name>The Apache Software Foundation</name>
65+
<url>http://www.apache.org/</url>
66+
</organization>
67+
68+
<issueManagement>
69+
<system>Github Issues</system>
70+
<url>https://github.com/apache/incubator-dubbo/issues</url>
71+
</issueManagement>
72+
7073
<dependencyManagement>
7174
<dependencies>
7275
<dependency>

‎dependencies-bom/pom.xml

+34-31
Original file line numberDiff line numberDiff line change
@@ -15,57 +15,60 @@
1515

1616
<name>dubbo-dependencies-bom</name>
1717
<description>Dubbo dependencies BOM</description>
18-
<url>http://dubbo.io</url>
19-
18+
<url>https://github.com/apache/incubator-dubbo</url>
2019
<inceptionYear>2011</inceptionYear>
2120
<licenses>
2221
<license>
23-
<name>Apache 2</name>
24-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
22+
<name>Apache License, Version 2.0</name>
23+
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
24+
<distribution>repo</distribution>
2525
</license>
2626
</licenses>
2727

28-
<organization>
29-
<name>The Dubbo Project</name>
30-
<url>http://dubbo.io</url>
31-
</organization>
32-
33-
<issueManagement>
34-
<system>Github Issues</system>
35-
<url>https://github.com/alibaba/dubbo/issues</url>
36-
</issueManagement>
3728
<scm>
38-
<url>https://github.com/alibaba/dubbo/tree/master</url>
39-
<connection>scm:git:git://github.com/alibaba/dubbo.git</connection>
40-
<developerConnection>scm:git:git@github.com:alibaba/dubbo.git</developerConnection>
41-
</scm>
29+
<url>https://github.com/apache/incubator-dubbo</url>
30+
<connection>scm:git:https://github.com/apache/incubator-dubbo.git</connection>
31+
<developerConnection>scm:git:https://github.com/apache/incubator-dubbo.git</developerConnection>
32+
</scm>
4233
<mailingLists>
4334
<mailingList>
44-
<name>Dubbo User Mailling List</name>
45-
<subscribe>[email protected]</subscribe>
46-
<unsubscribe>[email protected]</unsubscribe>
47-
<post>[email protected]</post>
48-
<archive>http://groups.google.com/group/dubbo</archive>
35+
<name>Development List</name>
36+
<subscribe>[email protected]</subscribe>
37+
<unsubscribe>[email protected]</unsubscribe>
38+
<post>[email protected]</post>
39+
</mailingList>
40+
<mailingList>
41+
<name>Commits List</name>
42+
<subscribe>[email protected]</subscribe>
43+
<unsubscribe>[email protected]</unsubscribe>
44+
<post>[email protected]</post>
4945
</mailingList>
5046
<mailingList>
51-
<name>Dubbo Developer Mailling List</name>
52-
<subscribe>[email protected]</subscribe>
53-
<unsubscribe>[email protected]</unsubscribe>
54-
<post>[email protected]</post>
55-
<archive>http://groups.google.com/group/dubbo-developers</archive>
47+
<name>Issues List</name>
48+
<subscribe>[email protected]</subscribe>
49+
<unsubscribe>[email protected]</unsubscribe>
50+
<post>[email protected]</post>
5651
</mailingList>
5752
</mailingLists>
5853
<developers>
5954
<developer>
6055
<id>dubbo.io</id>
6156
<name>The Dubbo Project Contributors</name>
62-
<email>[email protected]</email>
63-
<url>http://dubbo.io</url>
64-
<organization>The Dubbo Project</organization>
65-
<organizationUrl>http://dubbo.io</organizationUrl>
57+
<email>[email protected]</email>
58+
<url>http://dubbo.apache.org/</url>
6659
</developer>
6760
</developers>
6861

62+
<organization>
63+
<name>The Apache Software Foundation</name>
64+
<url>http://www.apache.org/</url>
65+
</organization>
66+
67+
<issueManagement>
68+
<system>Github Issues</system>
69+
<url>https://github.com/apache/incubator-dubbo/issues</url>
70+
</issueManagement>
71+
6972
<properties>
7073
<!-- Common libs -->
7174
<spring_version>4.3.16.RELEASE</spring_version>

0 commit comments

Comments
 (0)