[incubator-dubbo-website] branch asf-site updated: add report issue and edit links. resolve #314 (#317)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 357d176 add report issue and edit links. resolve #314 (#317)
357d176 is described below
commit 357d176d251f1ae75dc74c03016e578b7e840700
Author: kezhenxu94
AuthorDate: Sat Mar 9 15:51:52 2019 +0800
add report issue and edit links. resolve #314 (#317)
---
site_config/site.js | 16
1 file changed, 16 insertions(+)
diff --git a/site_config/site.js b/site_config/site.js
index d22dd32..67b24a2 100644
--- a/site_config/site.js
+++ b/site_config/site.js
@@ -81,6 +81,14 @@ export default {
text: 'Admin manual',
link: '/en-us/docs/admin/ops/dubbo-ops.html',
},
+{
+ text: 'Report a Doc Issue',
+ link: 'https://github.com/apache/incubator-dubbo-website/issues/new',
+},
+{
+ text: 'Edit This Page on GitHub',
+ link: 'https://github.com/apache/incubator-dubbo-website',
+},
],
},
resources: {
@@ -179,6 +187,14 @@ export default {
text: '运维管理',
link: '/zh-cn/docs/admin/ops/dubbo-ops.html',
},
+{
+ text: '报告文档问题',
+ link: 'https://github.com/apache/incubator-dubbo-website/issues/new',
+},
+{
+ text: '编辑此文档',
+ link: 'https://github.com/apache/incubator-dubbo-website',
+},
]
},
resources: {
[incubator-dubbo-spring-boot-project] branch master updated: rename endpoins -> endpoints (#461)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/master by this push:
new 82af201 rename endpoins -> endpoints (#461)
82af201 is described below
commit 82af201c546fc27e1be86a45e5c6a5ca7ef2e525
Author: format
AuthorDate: Fri Mar 8 22:59:43 2019 +0800
rename endpoins -> endpoints (#461)
---
.../actuate/autoconfigure/DubboEndpointAnnotationAutoConfiguration.java | 2 +-
...o-endpoins-default.properties => dubbo-endpoints-default.properties} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfiguration.java
b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfiguration.java
index aa65366..3b1d9cf 100644
---
a/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfiguration.java
+++
b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfiguration.java
@@ -39,7 +39,7 @@ import org.springframework.context.annotation.PropertySource;
@Configuration
@PropertySource(
name = "Dubbo Endpoints Default Properties",
-value = "classpath:/META-INF/dubbo-endpoins-default.properties")
+value = "classpath:/META-INF/dubbo-endpoints-default.properties")
public class DubboEndpointAnnotationAutoConfiguration {
@Bean
diff --git
a/dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoins-default.properties
b/dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoints-default.properties
similarity index 100%
rename from
dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoins-default.properties
rename to
dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoints-default.properties
[incubator-dubbo] branch 2.6.x updated: Multicast ipv6 support for branch 2.6.x (#3430)
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 8683da7 Multicast ipv6 support for branch 2.6.x (#3430)
8683da7 is described below
commit 8683da7231282ff8ab540e29752b46b1183cda6a
Author: ken.lj
AuthorDate: Fri Mar 8 17:05:27 2019 +0800
Multicast ipv6 support for branch 2.6.x (#3430)
* Multicast demo fails with message "Can't assign requested address
* remove useless code
* Fix multicast registry ut
---
.../com/alibaba/dubbo/common/utils/NetUtils.java | 33
.../registry/multicast/MulticastRegistry.java | 60 +-
.../registry/multicast/MulticastRegistryTest.java | 44 +++-
3 files changed, 111 insertions(+), 26 deletions(-)
diff --git
a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java
b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java
index 44ca3bc..1798f56 100644
--- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java
+++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java
@@ -21,8 +21,11 @@ import com.alibaba.dubbo.common.logger.Logger;
import com.alibaba.dubbo.common.logger.LoggerFactory;
import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.InetSocketAddress;
+import java.net.MulticastSocket;
import java.net.NetworkInterface;
import java.net.ServerSocket;
import java.net.UnknownHostException;
@@ -284,4 +287,34 @@ public class NetUtils {
return sb.toString();
}
+public static void joinMulticastGroup(MulticastSocket multicastSocket,
InetAddress multicastAddress) throws IOException {
+setInterface(multicastSocket, multicastAddress instanceof
Inet6Address);
+multicastSocket.setLoopbackMode(false);
+multicastSocket.joinGroup(multicastAddress);
+}
+
+public static void setInterface(MulticastSocket multicastSocket, boolean
preferIpv6) throws IOException {
+boolean interfaceSet = false;
+Enumeration interfaces = NetworkInterface.getNetworkInterfaces();
+while (interfaces.hasMoreElements()) {
+NetworkInterface i = (NetworkInterface) interfaces.nextElement();
+Enumeration addresses = i.getInetAddresses();
+while (addresses.hasMoreElements()) {
+InetAddress address = (InetAddress) addresses.nextElement();
+if (preferIpv6 && address instanceof Inet6Address) {
+multicastSocket.setInterface(address);
+interfaceSet = true;
+break;
+} else if (!preferIpv6 && address instanceof Inet4Address) {
+multicastSocket.setInterface(address);
+interfaceSet = true;
+break;
+}
+}
+if (interfaceSet) {
+break;
+}
+}
+}
+
}
\ No newline at end of file
diff --git
a/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java
b/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java
index d392839..73ff3b8 100644
---
a/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java
+++
b/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java
@@ -31,6 +31,7 @@ import com.alibaba.dubbo.registry.support.FailbackRegistry;
import java.io.IOException;
import java.net.DatagramPacket;
+import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.MulticastSocket;
@@ -58,11 +59,11 @@ public class MulticastRegistry extends FailbackRegistry {
private static final int DEFAULT_MULTICAST_PORT = 1234;
-private final InetAddress mutilcastAddress;
+private final InetAddress multicastAddress;
-private final MulticastSocket mutilcastSocket;
+private final MulticastSocket multicastSocket;
-private final int mutilcastPort;
+private final int multicastPort;
private final ConcurrentMap> received = new
ConcurrentHashMap>();
@@ -79,23 +80,21 @@ public class MulticastRegistry extends FailbackRegistry {
if (url.isAnyHost()) {
throw new IllegalStateException("registry address == null");
}
-if (!isMulticastAddress(url.getHost())) {
-throw new IllegalArgumentException("Invalid multicast address " +
url.getHost() + ", scope: 224.0.0.0 - 239.255.255.255");
-}
try {
-mutilcastAddress = InetAddress.getByName(url.getHost());
-mutilcastPort =
[incubator-dubbo-website] branch asf-site updated: build
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 6200e2d build
6200e2d is described below
commit 6200e2d970c7e9b2dc901a7c7be774ee39cc092a
Author: nzomkxia
AuthorDate: Fri Mar 8 16:51:51 2019 +0800
build
---
en-us/blog/download.html | 2 +
en-us/blog/download.json | 2 +-
en-us/blog/prepare-an-apache-release.html | 39 ++-
en-us/blog/prepare-an-apache-release.json | 2 +-
en-us/community/index.html | 2 +-
.../committer-guide/release-guide_dev.html | 43 +++--
.../committer-guide/release-guide_dev.json | 4 +-
md_json/blog.json | 18 +
md_json/docs.json | 4 +-
zh-cn/blog/download.html | 2 +
zh-cn/blog/download.json | 2 +-
zh-cn/blog/prepare-an-apache-release.html | 41 +++-
zh-cn/blog/prepare-an-apache-release.json | 2 +-
zh-cn/community/index.html | 2 +-
.../committer-guide/release-guide_dev.html | 45 --
.../committer-guide/release-guide_dev.json | 4 +-
16 files changed, 190 insertions(+), 24 deletions(-)
diff --git a/en-us/blog/download.html b/en-us/blog/download.html
index 37351f9..cbc3f98 100644
--- a/en-us/blog/download.html
+++ b/en-us/blog/download.html
@@ -13,6 +13,8 @@
中Verification
+you can follow these https://www.apache.org/info/verification";>procedures and the https://dist.apache.org/repos/dist/release/incubator/dubbo/KEYS";>KEYS
file to verify the download files
https://github.com/apache/incubator-dubbo";>Dubbo-RPC
Release Notes: https://github.com/apache/incubator-dubbo/releases";>https://github.com/apache/incubator-dubbo/releases
diff --git a/en-us/blog/download.json b/en-us/blog/download.json
index 85b889c..0074c0d 100644
--- a/en-us/blog/download.json
+++ b/en-us/blog/download.json
@@ -1,6 +1,6 @@
{
"filename": "download.md",
- "__html": "Downloads\nhttps://github.com/apache/incubator-dubbo\";>Dubbo-RPC\n\nRelease
Notes: https://github.com/apache/incubator-dubbo/releases\";>https://github.com/apache/incubator-dubbo/releases\n\n2.7.0
(2019-01-29)\n\nhttps://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.0/apache-dubbo-incubating-2.7.0-source-release.zip\";>source
|\nhttps://dist.apache.or [...]
+ "__html": "Downloads\nVerification\nyou can follow
these https://www.apache.org/info/verification\";>procedures and
the https://dist.apache.org/repos/dist/release/incubator/dubbo/KEYS\";>KEYS
file to verify the download files\nhttps://github.com/apache/incubator-dubbo\";>Dubbo-RPC\n\nRelease
Notes: https://github.com/apache/incubator-dubbo/releases\";>https://github.com/apache/incubator-dub
[...]
"link": "/en-us/blog/download.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/blog/prepare-an-apache-release.html
b/en-us/blog/prepare-an-apache-release.html
index 25e2673..0cc8f31 100644
--- a/en-us/blog/prepare-an-apache-release.html
+++ b/en-us/blog/prepare-an-apache-release.html
@@ -185,7 +185,8 @@ modifications and taggings related to ${release_version}
Release Candidates are
$ mvn release:prepare
-Prelease -Darguments="-Dmaven.test.skip=true"
-DautoVersionSubmodules=true -Dusername=YOUR
GITHUB ID -DpushChanges=false
-If you are promted to input password for pushing to GitHub (basically
including adding new commits and tags), do not input your login password of
GitHub. Use Personal access tokens instead. You can go to https://github.com/settings/profile";>https://github.com/settings/profile,
click Developer settings -> Personal access
tokens, and generate a new token if not. Please refer to this https://help.github.com/articles/creating [...]
+If you are promted to input password for pushing to GitHub (basically
including adding new commits and tags), do not input your login password of
GitHub. Use Personal access tokens instead. You can go to https://github.com/settings/profile";>https://github.com/settings/profile,
click Developer settings -> Personal access
tokens, and generate a new token if not. Please refer to this https://help.github.com/articles/creating [...]
+you need to choose the release artifactId, next artifactId and the release
tag, the default tag is dubbo-parent-, you need to change it to
dubbo-
After executing the above commands, you will find that:
@@ -423,8 +424,42 @@ The Apache Dubbo (Incubating) Team
Update the recommend dependency on https://github.com/apache/incubator-dubbo#maven-dependency";>Github to
the latest version, also update the version in other place if necessary.
Add t
[incubator-dubbo-website] branch asf-site updated: add release announce template & download verify
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new d104ede add release announce template & download verify
d104ede is described below
commit d104ede7bbaa24df35f2bb7d017b3460fb6dc4c5
Author: nzomkxia
AuthorDate: Fri Mar 8 16:44:32 2019 +0800
add release announce template & download verify
---
blog/en-us/download.md | 3 ++
blog/en-us/prepare-an-apache-release.md| 38 -
blog/zh-cn/download.md | 4 ++
blog/zh-cn/prepare-an-apache-release.md| 39 +-
.../committer-guide/release-guide_dev.md | 42 +--
.../committer-guide/release-guide_dev.md | 47 --
6 files changed, 163 insertions(+), 10 deletions(-)
diff --git a/blog/en-us/download.md b/blog/en-us/download.md
index 8f39a8b..3163a03 100644
--- a/blog/en-us/download.md
+++ b/blog/en-us/download.md
@@ -1,5 +1,8 @@
# Downloads
+## Verification
+
+you can follow these [procedures](https://www.apache.org/info/verification)
and the [KEYS](https://dist.apache.org/repos/dist/release/incubator/dubbo/KEYS)
file to verify the download files
## [Dubbo-RPC](https://github.com/apache/incubator-dubbo)
diff --git a/blog/en-us/prepare-an-apache-release.md
b/blog/en-us/prepare-an-apache-release.md
index 80f032a..b3ca9ee 100644
--- a/blog/en-us/prepare-an-apache-release.md
+++ b/blog/en-us/prepare-an-apache-release.md
@@ -184,7 +184,6 @@ modifications and taggings related to ${release_version}
Release Candidates are
```
> If you are promted to input password for pushing to GitHub (basically
including adding new commits and tags), do not input your login password of
GitHub. Use `Personal access tokens` instead. You can go to
https://github.com/settings/profile, click `Developer settings` -> `Personal
access tokens`, and generate a new token if not. Please refer to this
[guide](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/)
for more infomation.
-> 这里有一点要注意的是tag， 在执行过程中，需要选择发布的artifactId, 下一个版本artifactId以及发布版本的tag,
tag默认的是dubbo-parent-，需要改成dubbo-
> you need to choose the release artifactId, next artifactId and the
release tag, the default tag is dubbo-parent-, you need to change it to
dubbo-
@@ -462,7 +461,42 @@ When the release vote has passed,
6. Update the recommend dependency on
[Github](https://github.com/apache/incubator-dubbo#maven-dependency) to the
latest version, also update the version in other place if necessary.
7. Add the download link to official website
http://dubbo.apache.org/en-us/blog/download.html, using the ASF mirror system.
The latest release download link should be something like
[this](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/$VERSION/apache-dubbo-incubating-$VERSION-source-release.zip).
The download link for the previous release version should be changed like
[this](https://archive.apache.org/dist/incubator/dubbo/$VERSION/apache-dubbo-incubating-$VERSION-bin-releas
[...]
8. Make sure all the commits in the release branch are merged into master
branch, and then remove the remote release branch. For example: `git push
origin --delete 2.7.0-release`
-9. Send mail to d...@dubbo.apache.org and gene...@incubator.apache.org, notify
the community that the release is completed, you need to add disclaimer part at
the end of announce email, the content is the project DISCLAIMER file.
+9. Send mail to d...@dubbo.apache.org and gene...@incubator.apache.org, notify
the community that the release is completed.
+The mail template to announce release:
+```text
+Hello Community,
+
+The Apache Dubbo(incubating) team is pleased to announce that the
+2.6.6 has just been released.
+
+Apache Dubbo™ (incubating) is a high-performance, java based, open source
+RPC framework. Dubbo offers three key functionalities, which include
+interface based remote call, fault tolerance & load balancing, and
+automatic service registration & discovery.
+
+Both the source release[1] and the maven binary release[2] are available
+now, you can also find the detailed release notes in here[3].
+
+
+If you have any usage questions, or have problems when upgrading or find
+any problems about enhancements included in this release, please don’t
+hesitate to let us know by sending feedback to this mailing list or filing
+an issue on GitHub[4].
+
+
+
+=
+*Disclaimer*
+
+Apache Dubbo is an effort undergoing incubation at The Apache Software
Foundation (ASF), sponsored by the Incubator. Incubation is required of all
newly accepted projects until a further review indicates that the
infrastructure, communications, and decision making process have stabilized in
a manner con
