Fix minor issues reported in 2.6.2 RC1
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 4496ab2..b7c31c2 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@
## Enforcement
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at dubbo@googlegroups.com. 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.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at dev@dubbo.apache.org. 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.
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.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dd9ba96..6ef2d2b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,11 +10,11 @@
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.
-* 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.
+* 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.
* Add the ASF license header comment to all new .java files (copy from existing files in the project)
-* Add yourself as an @author to the .java files that you modify substantially (more than cosmetic changes).
+* 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.
* Add some Javadocs and, if you change the namespace, some XSD doc elements.
diff --git a/bom/pom.xml b/bom/pom.xml
index ca08bc9..19dcc87 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -16,57 +16,60 @@
<name>dubbo-bom</name>
<description>Dubbo dependencies BOM</description>
- <url>http://dubbo.io</url>
-
+ <url>https://github.com/apache/incubator-dubbo</url>
<inceptionYear>2011</inceptionYear>
<licenses>
<license>
- <name>Apache 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ <distribution>repo</distribution>
</license>
</licenses>
- <organization>
- <name>The Dubbo Project</name>
- <url>http://dubbo.io</url>
- </organization>
-
- <issueManagement>
- <system>Github Issues</system>
- <url>https://github.com/alibaba/dubbo/issues</url>
- </issueManagement>
<scm>
- <url>https://github.com/alibaba/dubbo/tree/master</url>
- <connection>scm:git:git://github.com/alibaba/dubbo.git</connection>
- <developerConnection>scm:git:git@github.com:alibaba/dubbo.git</developerConnection>
- </scm>
+ <url>https://github.com/apache/incubator-dubbo</url>
+ <connection>scm:git:https://github.com/apache/incubator-dubbo.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/incubator-dubbo.git</developerConnection>
+ </scm>
<mailingLists>
<mailingList>
- <name>Dubbo User Mailling List</name>
- <subscribe>dubbo+subscribe@googlegroups.com</subscribe>
- <unsubscribe>dubbo+unsubscribe@googlegroups.com</unsubscribe>
- <post>dubbo@googlegroups.com</post>
- <archive>http://groups.google.com/group/dubbo</archive>
+ <name>Development List</name>
+ <subscribe>dev-subscribe@dubbo.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@dubbo.apache.org</unsubscribe>
+ <post>dev@dubbo.apache.org</post>
</mailingList>
<mailingList>
- <name>Dubbo Developer Mailling List</name>
- <subscribe>dubbo-developers+subscribe@googlegroups.com</subscribe>
- <unsubscribe>dubbo-developers+unsubscribe@googlegroups.com</unsubscribe>
- <post>dubbo-developers@googlegroups.com</post>
- <archive>http://groups.google.com/group/dubbo-developers</archive>
+ <name>Commits List</name>
+ <subscribe>commits-subscribe@dubbo.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@dubbo.apache.org</unsubscribe>
+ <post>commits@dubbo.apache.org</post>
+ </mailingList>
+ <mailingList>
+ <name>Issues List</name>
+ <subscribe>issues-subscribe@dubbo.apache.org</subscribe>
+ <unsubscribe>issues-unsubscribe@dubbo.apache.org</unsubscribe>
+ <post>issues@dubbo.apache.org</post>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>dubbo.io</id>
<name>The Dubbo Project Contributors</name>
- <email>dubbo@googlegroups.com</email>
- <url>http://dubbo.io</url>
- <organization>The Dubbo Project</organization>
- <organizationUrl>http://dubbo.io</organizationUrl>
+ <email>dev-subscribe@dubbo.apache.org</email>
+ <url>http://dubbo.apache.org/</url>
</developer>
</developers>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <issueManagement>
+ <system>Github Issues</system>
+ <url>https://github.com/apache/incubator-dubbo/issues</url>
+ </issueManagement>
+
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 1c22e0a..d00728d 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -15,57 +15,60 @@
<name>dubbo-dependencies-bom</name>
<description>Dubbo dependencies BOM</description>
- <url>http://dubbo.io</url>
-
+ <url>https://github.com/apache/incubator-dubbo</url>
<inceptionYear>2011</inceptionYear>
<licenses>
<license>
- <name>Apache 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ <distribution>repo</distribution>
</license>
</licenses>
- <organization>
- <name>The Dubbo Project</name>
- <url>http://dubbo.io</url>
- </organization>
-
- <issueManagement>
- <system>Github Issues</system>
- <url>https://github.com/alibaba/dubbo/issues</url>
- </issueManagement>
<scm>
- <url>https://github.com/alibaba/dubbo/tree/master</url>
- <connection>scm:git:git://github.com/alibaba/dubbo.git</connection>
- <developerConnection>scm:git:git@github.com:alibaba/dubbo.git</developerConnection>
- </scm>
+ <url>https://github.com/apache/incubator-dubbo</url>
+ <connection>scm:git:https://github.com/apache/incubator-dubbo.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/incubator-dubbo.git</developerConnection>
+ </scm>
<mailingLists>
<mailingList>
- <name>Dubbo User Mailling List</name>
- <subscribe>dubbo+subscribe@googlegroups.com</subscribe>
- <unsubscribe>dubbo+unsubscribe@googlegroups.com</unsubscribe>
- <post>dubbo@googlegroups.com</post>
- <archive>http://groups.google.com/group/dubbo</archive>
+ <name>Development List</name>
+ <subscribe>dev-subscribe@dubbo.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@dubbo.apache.org</unsubscribe>
+ <post>dev@dubbo.apache.org</post>
</mailingList>
<mailingList>
- <name>Dubbo Developer Mailling List</name>
- <subscribe>dubbo-developers+subscribe@googlegroups.com</subscribe>
- <unsubscribe>dubbo-developers+unsubscribe@googlegroups.com</unsubscribe>
- <post>dubbo-developers@googlegroups.com</post>
- <archive>http://groups.google.com/group/dubbo-developers</archive>
+ <name>Commits List</name>
+ <subscribe>commits-subscribe@dubbo.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@dubbo.apache.org</unsubscribe>
+ <post>commits@dubbo.apache.org</post>
+ </mailingList>
+ <mailingList>
+ <name>Issues List</name>
+ <subscribe>issues-subscribe@dubbo.apache.org</subscribe>
+ <unsubscribe>issues-unsubscribe@dubbo.apache.org</unsubscribe>
+ <post>issues@dubbo.apache.org</post>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>dubbo.io</id>
<name>The Dubbo Project Contributors</name>
- <email>dubbo@googlegroups.com</email>
- <url>http://dubbo.io</url>
- <organization>The Dubbo Project</organization>
- <organizationUrl>http://dubbo.io</organizationUrl>
+ <email>dev-subscribe@dubbo.apache.org</email>
+ <url>http://dubbo.apache.org/</url>
</developer>
</developers>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <issueManagement>
+ <system>Github Issues</system>
+ <url>https://github.com/apache/incubator-dubbo/issues</url>
+ </issueManagement>
+
<properties>
<!-- Common libs -->
<spring_version>4.3.16.RELEASE</spring_version>
