Merge pull request alibaba#1 from alibaba/master

Master

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,28 @@
+<!-- Here is for bug reports and feature requests ONLY! 
+
+If you're looking for help, please check our mail list、WeChat group and the Gitter room.
+
+Please try to use English to describe your issue, or at least provide a snippet of English translation.
+我们鼓励使用英文，如果不能直接使用，可以使用翻译软件，您仍旧可以保留中文原文。
+-->
+
+## Issue Description
+
+Type: *bug report* or *feature request*
+
+### Describe what happened (or what feature you want)
+
+
+### Describe what you expected to happen
+
+
+### How to reproduce it (as minimally and precisely as possible)
+
+1. 
+2. 
+3. 
+
+### Tell us your environment
+
+
+### Anything else we need to know?

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Here is for bug reports and feature requests ONLY! 
+
+If you're looking for help, please check our mail list、WeChat group and the Gitter room.
+
+Please try to use English to describe your issue, or at least provide a snippet of English translation.
+我们鼓励使用英文，如果不能直接使用，可以使用翻译软件，您仍旧可以保留中文原文。
+-->
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Acutally behavior**
+A clear and concise description of what you actually to happen.
+
+**How to Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Centos]
+ - Version [e.g. nacos-server 1.3.1, nacos-client 1.3.1]
+ - Module [e.g. naming/config]
+ - SDK [e.g. original, spring-cloud-alibaba-nacos, dubbo]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,20 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
+<!-- Here is for bug reports and feature requests ONLY! 
+
+If you're looking for help, please check our mail list、WeChat group and the Gitter room.
+
+Please try to use English to describe your issue, or at least provide a snippet of English translation.
+我们鼓励使用英文，如果不能直接使用，可以使用翻译软件，您仍旧可以保留中文原文。
+-->
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 

.github/ISSUE_TEMPLATE/old-issue-template.md

@@ -0,0 +1,37 @@
+---
+name: Old issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Here is for bug reports and feature requests ONLY! 
+
+If you're looking for help, please check our mail list、WeChat group and the Gitter room.
+
+Please try to use English to describe your issue, or at least provide a snippet of English translation.
+我们鼓励使用英文，如果不能直接使用，可以使用翻译软件，您仍旧可以保留中文原文。
+-->
+
+## Issue Description
+
+Type: *bug report* or *feature request*
+
+### Describe what happened (or what feature you want)
+
+
+### Describe what you expected to happen
+
+
+### How to reproduce it (as minimally and precisely as possible)
+
+1. 
+2. 
+3. 
+
+### Tell us your environment
+
+
+### Anything else we need to know?

.github/stale.yml

@@ -0,0 +1,35 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 180
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+    - good first issue
+    - contribution welcome
+    - dependencies
+    - kind/bug
+    - kind/code quality
+    - kind/enhancement
+    - kind/performance
+    - kind/proposal
+    - kind/refactor
+    - kind/feature
+    - kind/user experience
+    - Soc2019
+    - SoC2020
+    - kind/notice
+# Label to use when marking an issue as stale
+staleLabel: expired
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+    Thanks for your feedback and contribution. But the issue/pull request has
+    not had recent activity more than **180 days**. This issue/pull request will
+    be closed if no further activity occurs **7 days later**.
+
+    We may solve this issue in new version. So can you upgrade to newest version
+    and retry?
+
+    If there are still issues or want to contribute again. Please create new issue
+    or pull request again.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/maven.yml

@@ -0,0 +1,23 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04]
+        java: [8, 8.0.192, 11, 11.0.9]
+      fail-fast: false
+      max-parallel: 2          
+    name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK
+      uses: actions/setup-java@v1
+      with:
+        java-version: ${{ matrix.java }}
+    - name: Test with Maven
+      run: mvn test -B --file pom.xml

.gitignore

@@ -3,7 +3,6 @@
 .project
 .settings
 target
-.project
 .idea
 .vscode
 .DS_Store
@@ -13,3 +12,6 @@ target
 node_modules
 test/derby.log
 derby.log
+work
+test/logs
+derby.log

.travis.yml

@@ -1,8 +1,6 @@
 notifications:
   email:
     recipients:
-      - xchaos8@126.com
-      - nacos_dev@linux.alibaba.com
       - dev-nacos@googlegroups.com
       - mw_configcenter@list.alibaba-inc.com
   on_success: change
@@ -12,21 +10,26 @@ language: java
 
 matrix:
   include:
-  # On OSX, run with default JDK only.
-  # - os: osx
-  # On Linux, run with specific JDKs only.
-  - os: linux
-    env: CUSTOM_JDK="oraclejdk8"
+    # On OSX, run with default JDK only.
+    # - os: osx
+    # On Linux, run with specific JDKs only.
+    - os: linux
+      env: CUSTOM_JDK="oraclejdk8"
+
+jdk:
+  - openjdk11
+  - openjdk8
 
 before_install:
   - echo 'MAVEN_OPTS="$MAVEN_OPTS -Xmx1024m -XX:MaxPermSize=512m -XX:+BytecodeVerificationLocal"' >> ~/.mavenrc
   - cat ~/.mavenrc
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then jdk_switcher use "$CUSTOM_JDK"; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
+#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then jdk_switcher use "$CUSTOM_JDK"; fi
 
 script:
   - mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true
-  - mvn -Prelease-nacos clean install -U
+  - mvn -Prelease-nacos -Dmaven.test.skip=true clean install -U
+  - mvn clean install -Pcit-test
   - mvn clean package -Pit-test
 after_success:
   - mvn clean package -Pit-test

BUILDING

@@ -35,4 +35,4 @@ Build Instructions for NACOS
     Execute the following command in order to build the tar.gz packages and install JAR into local repository:
 
 	#build nacos
-    $ mvn -Prelease-nacos -DskipTests clean install -U
+    $ mvn -Prelease-nacos -Dmaven.test.skip=true clean install -U

CHANGELOG.md

@@ -1,3 +1,52 @@
+## 1.0.0-RC4(Mar 22, 2019)
+* [#923] Nacos 1.0.0 compatible with nacos-client 0.6.2
+* [#938] Client beat processor task lost
+* [#946] Change default server mode to AP
+
+
+
+## 1.0.0-RC1(Mar 15, 2019)
+
+* [#870] About Nacos's namespace and tenant design
+* [#869] Client exception message is confusing
+* [#866] BeatInfo scheduled property may have the memory visibility issue
+* [#865] checksum value is not correct
+* [#839] Refactor API URLs 
+* [#811] ApiCommands.updateIpPublish countDownLatch timeout issue
+* [#809] Instance field 'valid' should be deprecated and replaced by 'healthy'
+* [#803] Nacos front-end function regression plan and landing
+* [#801] Nacos uses nignx as a best practice article for current limiting.
+* [#757] The word 'domain' should be replaced by 'service'
+* [#745] Support server running mode in CP, AP or mixed
+* [#744] The exact status of server should be stored and controlled
+* [#725] Will the nacos registry be how to do multi-environment deployment?
+* [#677] Support ephemeral instances and persistent instances
+* [#651] Remove old API entry 'APICommands'
+* [#650] Refactor server list management to make it irrelevant to consistency protocol
+* [#634] Add global push enable switch and data query enable switch
+* [#629] Server data needs warm up before open traffic
+* [#502] Registering ephemeral instance as well as persistent instances
+* [#501] Health check mode confict when building muilt clusters whit nacos sync + nacos
+* [#479] Metadata should be displayed and edited using standard property syntax
+* [#327] Inform the ACM SDK of the RAM role name and access the configuration ? ?
+* [#269] need to support service group in naming module
+
+## 0.9.0(Feb 28, 2019)
+
+* [#840] Nacos server adds startup mode to distinguish between config and naming.
+* [#762] Register instance returns failed when the health check mode is 'server' in standalone mode.
+* [#473] Nacos Cluster Mode kubernate Startup nacos.log error Log.
+* [#240] Log strong dependence problem.
+* [#824] getServicesOfServer throws exception if service list is empty.
+* [#802] Nacos server multi-boot mode support.
+* [#800] Nacos's client-to-server addressing mode document introduction.
+* [#768] The interval at which the heartbeat is sent in BeatReactor is not controlled by the server return value.
+* [#759] why instance can't auto-delete.
+* [#756] Format of instance and service should be validated.
+* [#720] Memory leak in PushService.
+* [#653] IoUtils under nacos-common-0.2.1-RC1.jar lacks "" judgment on encoding.
+* [#588] Client compatible to jdk1.6.
+
 ## 0.8.0(Jan 22, 2019) PRE-GA
 
 * [#162] Support open metrics and prometheus

CONTRIBUTING.md

@@ -90,7 +90,7 @@ Some principles:
 
 -   Testability - 80% of the new code should be covered by unit test cases.
 
--   Maintainability - Comply with our [PMD spec](style/codeStyle.xml), and 3-month-frequency update should be maintained at least.
+-   Maintainability - Comply with our [PMD spec](style/codeStyle.md), and 3-month-frequency update should be maintained at least.
 
 
 ### Now how about try become a committer?

NOTICE

@@ -1,5 +1,5 @@
 Nacos
-Copyright 2018-2019 The Apache Software Foundation
+Copyright 2018-2020
 
 This product includes software developed at
 The Alibaba MiddleWare Group.
@@ -29,4 +29,4 @@ under the License.
 
 Also, please refer to each LICENSE.<component>.txt file, which is located in
 the 'license' directory of the distribution file, for the license terms of the
-components that this product depends on.
+components that this product depends on.