add rheakv

.aci.yml

@@ -0,0 +1,60 @@
+stages: # 定义了一条pipeline
+  - 代码检测 # 定义了stage
+  - 测试
+  - 编译
+
+  #- 发布JAR包
+
+PMD扫描: # 定义了一个job
+  stage: 代码检测 # 绑定到stage
+  plugin: PMD # 指定使用的插件
+  checkRule: # 校验结果
+    - pmd1 = 0 && pmd2 = 0
+
+STC扫描:
+  stage: 代码检测
+  plugin: STC
+  checkRule:
+    - stc = 0
+
+# see https://yuque.antfin.com/linke/help/kg1p34#pBvc2
+单元测试:
+  stage: 测试
+  plugin: LINKQ-UT         # java单元测试插件
+  checkRule:
+    - passRate = 100
+  tools:
+    jdk: '1.8'  #jdk版本枚举：1.6、1.7、1.8
+    maven: 3.2.5
+  parameters:
+    encoding: UTF-8 # 编码设置
+    COVERAGE_EXCLUSIONS: '**/bootstrap/**,**/integration/**,**/client/pb/**,**/MetaApplication,**/registry/jraft/**,**/DataApplication,**/SessionApplication' # 覆盖率排除
+  pluginConfig:
+    markdown: admin/result.md # 向页面输出一些自定义内容
+    aciTags: 8G
+
+#see https://code.alipay.com/common_release/avatarpoc/blob/master/.aci.test.yml
+集成测试:
+  stage: 测试
+  plugin: LINKQ-IT         # java集成测试插件
+  checkRule:
+    - passRate = 100
+  tools:
+    jdk: '1.8'
+  parameters:
+    encoding: UTF-8 # 编码设置
+  pluginConfig:
+    privateRepo: false, # 是否是私有仓库
+    parallelCount: 1 # 并发执行个数
+    enableOracle: false # 是否依赖Oracle
+
+编译:
+  stage: 编译
+  plugin: ANT-BUILD         # 使用插件ANT-BUILD
+  pluginConfig:
+    image: reg.docker.alibaba-inc.com/antb/sofa-build:0.0.2
+    script:
+      - export PATH=$PATH:/opt/taobao/java/bin:/opt/taobao/maven/bin
+      - java -version
+      - mvn -version
+      - mvn clean package -Dmaven.test.skip=true -Pdev

.github/workflows/maven.yml

@@ -0,0 +1,28 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn clean install -DskipTests -B -V
+        && sh ./tools/check_format.sh
+        && mvn clean test
+    - name: Codecov
+      uses: codecov/codecov-action@v1

.gitignore

@@ -16,4 +16,5 @@ dependency-reduced-pom.xml
 
 # log
 logs/
-*.log
+*.log
+LOG_HOME_IS_UNDEFINED

.master.aci.yml

@@ -0,0 +1,65 @@
+stages: # 定义了一条pipeline
+  - 代码检测 # 定义了stage
+  - 测试
+  - 编译
+  - 发布JAR包
+
+PMD扫描: # 定义了一个job
+  stage: 代码检测 # 绑定到stage
+  plugin: PMD # 指定使用的插件
+  checkRule: # 校验结果
+    - pmd1 = 0 && pmd2 = 0
+
+STC扫描:
+  stage: 代码检测
+  plugin: STC
+  checkRule:
+    - stc = 0
+
+单元测试:
+  stage: 测试
+  plugin: LINKQ-UT         # java单元测试插件
+  checkRule:
+    - passRate = 100
+  pluginConfig:
+    markdown: admin/result.md # 向页面输出一些自定义内容
+
+#see https://code.alipay.com/common_release/avatarpoc/blob/master/.aci.test.yml
+集成测试:
+  stage: 测试
+  plugin: LINKQ-IT         # java集成测试插件
+  checkRule:
+    - passRate = 100
+  tools:
+    jdk: '1.8'
+  parameters:
+    encoding: UTF-8 # 编码设置
+  pluginConfig:
+    privateRepo: false, # 是否是私有仓库
+    parallelCount: 1 # 并发执行个数
+    enableOracle: false # 是否依赖Oracle
+
+编译:
+  stage: 编译
+  plugin: ANT-BUILD         # 使用插件ANT-BUILD
+  pluginConfig:
+    image: reg.docker.alibaba-inc.com/antb/sofa-build:0.0.2
+    script:
+      - export PATH=$PATH:/opt/taobao/java/bin:/opt/taobao/maven/bin
+      - java -version
+      - mvn -version
+      - mvn clean package -Dmaven.test.skip=true -Pdev
+
+发布JAR包:
+  stage: 发布JAR包
+  plugin: ANT-BUILD
+  pluginConfig:
+    image: reg.docker.alibaba-inc.com/antb/jarbuild:0.0.1
+    script:
+      - java -version
+      - mvn -version
+      - sed -i '/<mirrors>/,/<\/mirrors>/d' /opt/taobao/maven_settings/settings-release.xml
+      - sed -i '/<profiles>/,/<\/profiles>/d' /opt/taobao/maven_settings/settings-release.xml
+      - echo '#############relase'
+      - cat /opt/taobao/maven_settings/settings-release.xml
+      - mvn clean deploy -Dmaven.test.skip=true -s /opt/taobao/maven_settings/settings-release.xml -Pdev -Pantcode-release

.travis.yml

@@ -1,6 +1,8 @@
 language: java
 sudo: false
 
+dist: trusty
+
 jdk:
 - oraclejdk8
 
@@ -12,4 +14,4 @@ script:
 - sh ./tools/check_format.sh
 
 after_success:
-- bash <(curl -s https://codecov.io/bash)
+- bash <(curl -s https://codecov.io/bash)

Makefile

@@ -0,0 +1,2 @@
+proto:
+	protoc-3.5.1 --proto_path=./server/common/model/src/main/resources/proto --java_out=server/common/model/src/main/java  server/common/model/src/main/resources/proto/*.proto

README.md

@@ -1,13 +1,13 @@
 # SOFARegistry
 
-[![Build Status](https://travis-ci.com/alipay/sofa-registry.svg?branch=master)](https://travis-ci.com/alipay/sofa-registry)
+[![Java CI with Maven](https://github.com/sofastack/sofa-registry/actions/workflows/maven.yml/badge.svg)](https://github.com/sofastack/sofa-registry/actions/workflows/maven.yml)
 ![license](https://img.shields.io/badge/license-Apache--2.0-green.svg)
-[![Coverage Status](https://codecov.io/gh/alipay/sofa-registry/branch/master/graph/badge.svg)](https://codecov.io/gh/alipay/sofa-registry)
-![maven](https://img.shields.io/github/release/alipay/sofa-registry.svg)
+[![Coverage Status](https://codecov.io/gh/alipay/sofa-registry/branch/master/graph/badge.svg)](https://codecov.io/gh/sofastack/sofa-registry)
+![maven](https://img.shields.io/github/release/sofastack/sofa-registry.svg)
 
 SOFARegistry 是蚂蚁金服开源的一个生产级、高时效、高可用的服务注册中心。SOFARegistry 最早源自于淘宝的 ConfigServer，十年来，随着蚂蚁金服的业务发展，注册中心架构已经演进至第五代。目前 SOFARegistry 不仅全面服务于蚂蚁金服的自有业务，还随着蚂蚁金融科技服务众多合作伙伴，同时也兼容开源生态。SOFARegistry 采用 AP 架构，支持秒级时效性推送，同时采用分层架构支持无限水平扩展。
 
-## 功能特性
+## 功能特性 
 
 - 支持服务发布与服务订阅
 - 支持服务变更时的主动推送

client/all/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>registry-client-all</artifactId>
-    <version>5.2.0-SNAPSHOT</version>
+    <version>6.0.1</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <url>http://github.com/alipay/sofa-registry</url>
@@ -52,11 +52,11 @@
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bolt.version>1.4.6</bolt.version>
-        <hessian.version>3.3.6</hessian.version>
+        <bolt.version>1.6.2</bolt.version>
+        <hessian.version>3.3.8</hessian.version>
         <lookout.version>1.5.2</lookout.version>
         <sofa.common.tools.version>1.0.12</sofa.common.tools.version>
-        <netty.version>4.1.25.Final</netty.version>
+        <netty.version>4.1.42.Final</netty.version>
         <slf4j.version>1.7.21</slf4j.version>
         <main.user.dir>../../</main.user.dir>
     </properties>

client/api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>6.0.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client/api/src/main/java/com/alipay/sofa/registry/client/api/ConfigDataObserver.java

@@ -20,16 +20,17 @@
 
 /**
  * The interface Persistence data observer.
+ *
  * @author zhuoyu.sjw
  * @version $Id : ConfigDataObserver.java, v 0.1 2018-04-17 17:02 zhuoyu.sjw Exp $$
  */
 public interface ConfigDataObserver {
 
-    /**
-     * Handle data.
-     *
-     * @param dataId the data id 
-     * @param configData the persistence data
-     */
-    void handleData(String dataId, ConfigData configData);
+  /**
+   * Handle data.
+   *
+   * @param dataId the data id
+   * @param configData the persistence data
+   */
+  void handleData(String dataId, ConfigData configData);
 }

client/api/src/main/java/com/alipay/sofa/registry/client/api/Configurator.java

@@ -20,29 +20,30 @@
 
 /**
  * The interface Configurator.
+ *
  * @author zhuoyu.sjw
  * @version $Id : Configurator.java, v 0.1 2018-04-17 17:26 zhuoyu.sjw Exp $$
  */
 public interface Configurator extends Register {
 
-    /**
-     * Gets data observer.
-     *
-     * @return the data observer
-     */
-    ConfigDataObserver getDataObserver();
+  /**
+   * Gets data observer.
+   *
+   * @return the data observer
+   */
+  ConfigDataObserver getDataObserver();
 
-    /**
-     * Sets config data observer.
-     *
-     * @param configDataObserver the config data observer
-     */
-    void setDataObserver(ConfigDataObserver configDataObserver);
+  /**
+   * Sets config data observer.
+   *
+   * @param configDataObserver the config data observer
+   */
+  void setDataObserver(ConfigDataObserver configDataObserver);
 
-    /**
-     * Peek data config data.
-     *
-     * @return the config data
-     */
-    ConfigData peekData();
+  /**
+   * Peek data config data.
+   *
+   * @return the config data
+   */
+  ConfigData peekData();
 }

client/api/src/main/java/com/alipay/sofa/registry/client/api/EventBus.java

@@ -20,46 +20,47 @@
 
 /**
  * The interface Event bus.
+ *
  * @author zhuoyu.sjw
  * @version $Id : EventBus.java, v 0.1 2018-07-12 21:11 zhuoyu.sjw Exp $$
  */
 public interface EventBus {
 
-    /**
-     * Is enable boolean.
-     *
-     * @return the boolean
-     */
-    boolean isEnable();
+  /**
+   * Is enable boolean.
+   *
+   * @return the boolean
+   */
+  boolean isEnable();
 
-    /**
-     * Is enable boolean.
-     *
-     * @param eventClass the event class 
-     * @return the boolean
-     */
-    boolean isEnable(Class<? extends Event> eventClass);
+  /**
+   * Is enable boolean.
+   *
+   * @param eventClass the event class
+   * @return the boolean
+   */
+  boolean isEnable(Class<? extends Event> eventClass);
 
-    /**
-     * Register.
-     *
-     * @param eventClass the event class     
-     * @param eventSubscriber the event subscriber
-     */
-    void register(Class<? extends Event> eventClass, EventSubscriber eventSubscriber);
+  /**
+   * Register.
+   *
+   * @param eventClass the event class
+   * @param eventSubscriber the event subscriber
+   */
+  void register(Class<? extends Event> eventClass, EventSubscriber eventSubscriber);
 
-    /**
-     * Un register.
-     *
-     * @param eventClass the event class    
-     * @param eventSubscriber the event subscriber
-     */
-    void unRegister(Class<? extends Event> eventClass, EventSubscriber eventSubscriber);
+  /**
+   * Un register.
+   *
+   * @param eventClass the event class
+   * @param eventSubscriber the event subscriber
+   */
+  void unRegister(Class<? extends Event> eventClass, EventSubscriber eventSubscriber);
 
-    /**
-     * Post event.
-     *
-     * @param event the event
-     */
-    void post(final Event event);
+  /**
+   * Post event.
+   *
+   * @param event the event
+   */
+  void post(final Event event);
 }