Merge branch 'ctripcorp:master' into master

.github/ISSUE_TEMPLATE/bug_report.md → .github/ISSUE_TEMPLATE/bug_report_en.md

@@ -1,34 +1,36 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-- [ ] I have searched the [issues](https://github.com/ctripcorp/apollo/issues) of this repository and believe that this is not a duplicate.
-- [ ] I have checked the [FAQ](https://github.com/ctripcorp/apollo/wiki/%E9%83%A8%E7%BD%B2&%E5%BC%80%E5%8F%91%E9%81%87%E5%88%B0%E7%9A%84%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98) of this repository and believe that this is not a duplicate.
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. 
-2. 
-3. 
-4. 
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-### Additional Details & Logs
-
-- Version
-- Error logs
-- Configuration
-- Platform and Operating System
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+---
+
+<!-- The content in here will not be show。To forbid duplication，easier search in the feature，before you create an issue，please check the following. If your question is a newer/beginner's，recommand to https://github.com/ctripcorp/apollo/discussions to ask it. -->
+
+- [ ] I have checked the [discussions](https://github.com/ctripcorp/apollo/discussions)
+- [ ] I have searched the [issues](https://github.com/ctripcorp/apollo/issues) of this repository and believe that this is not a duplicate.
+- [ ] I have checked the [FAQ](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase) of this repository and believe that this is not a duplicate.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. 
+2. 
+3. 
+4. 
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+### Additional Details & Logs
+
+- Version
+- Error logs
+- Configuration
+- Platform and Operating System

.github/ISSUE_TEMPLATE/bug_report_zh.md

@@ -0,0 +1,41 @@
+---
+name: 报告Bug/使用疑问
+about: 提交Apollo Bug/使用疑问，使用这个模板
+title: ''
+labels: ''
+assignees: ''
+---
+
+<!-- 这段文字不会显示在你的内容中。为了避免重复的信息，方便后续的检索，在提issue之前，请检查如下事项。如果是比较新手级别的问题，推荐到讨论区https://github.com/ctripcorp/apollo/discussions 提问 -->
+
+- [ ] 我已经检查过[discussions](https://github.com/ctripcorp/apollo/discussions)
+- [ ] 我已经搜索过[issues](https://github.com/ctripcorp/apollo/issues)
+- [ ] 我已经仔细检查过[FAQ](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase)
+
+**描述bug**
+
+简洁明了地描述一下bug
+
+**复现**
+
+通过如下步骤可以复现：
+
+1. 
+2. 
+3. 
+4. 
+
+**期望**
+
+简介明了地描述你希望正常情况下应该发生什么
+
+**截图**
+
+如果可以，附上截图来描述你的问题
+
+### 额外的细节和日志
+
+- 版本：
+- 错误日志
+- 配置：
+- 平台和操作系统

.github/ISSUE_TEMPLATE/feature_request.md → .github/ISSUE_TEMPLATE/feature_request_en.md

@@ -1,20 +1,20 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**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 [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**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 [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request_zh.md

@@ -0,0 +1,25 @@
+---
+name: 请求特性
+about: 给这个项目提一些建议、想法
+title: ''
+labels: ''
+assignees: ''
+---
+
+**你的特性请求和某个问题有关吗？请描述**
+
+清晰简洁地描述这个问题是什么。即，当碰到xxx时，总是感觉很麻烦
+
+
+
+**清晰简洁地描述一下你希望的解决方案**
+
+
+
+**清晰简洁地描述一下这个特性的备选方案**
+
+
+
+**其它背景**
+
+在这里添加和这个特性请求有关的背景说明、截图

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,3 +15,4 @@ Follow this checklist to help us incorporate your contribution quickly and easil
 - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
 - [ ] Write necessary unit tests to verify the code.
 - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
+- [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).

.github/stale.yml

@@ -1,8 +1,23 @@
+#
+# Copyright 2021 Apollo Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # General configuration
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 30
 # Issues with these labels will never be considered stale
 exemptLabels:
   - bug
@@ -28,34 +43,34 @@ staleLabel: stale
 pulls:
   # Number of days of inactivity before a stale Issue or Pull Request is closed.
   # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-  daysUntilClose: 30
+  daysUntilClose: 14
   # Comment to post when marking as stale. Set to `false` to disable
   markComment: >
     This pull request has been automatically marked as stale because it has not had activity
-    in the last 90 days. It will be closed in 30 days if no further activity occurs. Please
+    in the last 30 days. It will be closed in 14 days if no further activity occurs. Please
     feel free to give a status update now, ping for review, or re-open when it's ready.
     Thank you for your contributions!
   # Comment to post when closing a stale Issue or Pull Request.
   closeComment: >
      This pull request has been automatically closed because it has not had
-     activity in the last 30 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
+     activity in the last 14 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
      Thank you for your contributions!
   # Limit the number of actions per hour, from 1-30. Default is 30
-  limitPerRun: 1
+  limitPerRun: 30
 
 # Issue specific configuration
 issues:
   # Number of days of inactivity before a stale Issue or Pull Request is closed.
-  daysUntilClose: 14
+  daysUntilClose: 7
   # Comment to post when marking as stale. Set to `false` to disable
   markComment: >
     This issue has been automatically marked as stale because it has not had activity in the
-    last 90 days. It will be closed in 14 days unless it is tagged "help wanted" or other activity
+    last 30 days. It will be closed in 7 days unless it is tagged "help wanted" or other activity
     occurs. Thank you for your contributions.
   # Comment to post when closing a stale Issue or Pull Request.
   closeComment: >
     This issue has been automatically closed because it has not had activity in the
-    last 14 days. If this issue is still valid, please ping a maintainer and ask them to label it as "help wanted".
+    last 7 days. If this issue is still valid, please ping a maintainer and ask them to label it as "help wanted".
     Thank you for your contributions.
   # Limit the number of actions per hour, from 1-30. Default is 30
-  limitPerRun: 1
+  limitPerRun: 30

.github/workflows/build.yml

@@ -1,22 +1,35 @@
+#
+# Copyright 2021 Apollo Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 # 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: github-ci
+name: build
 
 on:
   push:
     branches: [ master ]
-    paths-ignore: [ '**/*.md' ]
   pull_request:
     branches: [ master ]
-    paths-ignore: [ '**/*.md' ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [7, 11]
+        jdk: [7, 8, 11]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK
@@ -32,6 +45,14 @@ jobs:
     - name: Build SDK with JDK 7
       if: matrix.jdk == '7'
       run: mvn clean compile -pl apollo-client,apollo-mockserver,apollo-openapi -am -Dmaven.gitcommitid.skip=true
-    - name: Full Build
-      if: matrix.jdk != '7'
+    - name: JDK 8
+      if: matrix.jdk == '8'
+      run: mvn -B clean package -P travis jacoco:report -Dmaven.gitcommitid.skip=true
+    - name: JDK 11 
+      if: matrix.jdk == '11'
       run: mvn clean compile -Dmaven.gitcommitid.skip=true
+    - name: Upload coverage to Codecov
+      if: matrix.jdk == '8'
+      uses: codecov/codecov-action@v1
+      with:
+        file: ${{ github.workspace }}/apollo-*/target/site/jacoco/jacoco.xml

.github/workflows/cla.yml

@@ -0,0 +1,52 @@
+#
+# Copyright 2021 Apollo Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+name: "CLA Assistant"
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened,closed,synchronize]
+
+jobs:
+  CLAssistant:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "CLA Assistant"
+        if: (github.event.comment.body == 'recheck' || startsWith(github.event.comment.body, 'I have read the CLA Document and I hereby sign the CLA')) || github.event_name == 'pull_request_target'
+        # Beta Release
+        uses: cla-assistant/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # the below token should have repo scope and must be manually added by you in the repository's secret
+          PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN_FOR_CLA_ASSISTANT }}
+        with:
+          path-to-signatures: 'signatures/version1/cla.json'
+          path-to-document: 'https://github.com/ctripcorp/apollo-community/blob/master/CLA.md' # e.g. a CLA or a DCO document
+          # branch should not be protected
+          branch: 'master'
+          allowlist: dependabot,bot*
+          remote-repository-name: apollo-community
+
+         #below are the optional inputs - If the optional inputs are not given, then default values will be taken
+          #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)
+          #remote-repository-name:  enter the  remote repository name where the signatures should be stored (Default is storing the signatures in the same repository)
+          #create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
+          #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo'
+          #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
+          #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
+          #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
+          #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
+          #use-dco-flag: true - If you are using DCO instead of CLA