Merge pull request #1 from apache/dev

update

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,14 +1,16 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[BUG] bug title "
+title: "[Bug][Module Name] Bug title "
 labels: bug
 assignees: ''
 
 ---
 
 *For better global communication, please give priority to using English description, thx! *
 
+*Please review https://dolphinscheduler.apache.org/en-us/docs/development/issue.html when describe an issue.*
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
@@ -32,5 +34,5 @@ If applicable, add screenshots to help explain your problem.
 **Additional context**
 Add any other context about the problem here.
 
-**Requirement or improvement
+**Requirement or improvement**
 - Please describe about your requirements or improvement suggestions.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,12 +1,19 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: "[Feature]"
+title: "[Feature][Module Name] Feature title"
 labels: new feature
 assignees: ''
 
 ---
 
+*For better global communication, please give priority to using English description, thx! *
+
+*Please review https://dolphinscheduler.apache.org/en-us/docs/development/issue.html when describe an issue.*
+
+**Describe the feature**
+A clear and concise description of what the feature is.
+
 **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/improvement_suggestion.md

@@ -0,0 +1,24 @@
+---
+name: Improvement suggestion
+about: Improvement suggestion for this project
+title: "[Improvement][Module Name] Improvement title"
+labels: improvement
+assignees: ''
+
+---
+
+*For better global communication, please give priority to using English description, thx! *
+
+*Please review https://dolphinscheduler.apache.org/en-us/docs/development/issue.html when describe an issue.*
+
+**Describe the question**
+A clear and concise description of what the improvement is.
+
+**What are the current deficiencies and the benefits of improvement**
+- A clear and concise description of the current deficiencies and the benefits of this improvement.
+
+**Which version of DolphinScheduler:**
+ -[1.1.0-preview]
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative improvement solutions you've considered.

.github/ISSUE_TEMPLATE/question.md

@@ -1,14 +1,16 @@
 ---
-name: question
-about: have a question wanted to be help
-title: "[QUESTION] question title"
+name: Question
+about: Have a question wanted to be help
+title: "[Question] Question title"
 labels: question
 assignees: ''
 
 ---
 
 *For better global communication, please give priority to using English description, thx! *
 
+*Please review https://dolphinscheduler.apache.org/en-us/docs/development/issue.html when describe an issue.*
+
 **Describe the question**
 A clear and concise description of what the question is.
 
@@ -19,5 +21,5 @@ A clear and concise description of what the question is.
 **Additional context**
 Add any other context about the problem here.
 
-**Requirement or improvement
+**Requirement or improvement**
 - Please describe about your requirements or improvement suggestions.

.github/ISSUE_TEMPLATE/test.md

@@ -0,0 +1,24 @@
+---
+name: Test
+about: Test to enhance the robustness of this project
+title: "[Test][Module Name] Test title"
+labels: test
+assignees: ''
+
+---
+
+*For better global communication, please give priority to using English description, thx! *
+
+*Please review https://dolphinscheduler.apache.org/en-us/docs/development/issue.html when describe an issue.*
+
+**Describe the question**
+A clear and concise description of what the test part is.
+
+**What are the current deficiencies and the benefits of changing or adding this test**
+- A clear and concise description of the current deficiencies, the benefits of changing or adding this test, and the scope involved.
+
+**Which version of DolphinScheduler:**
+ -[1.1.0-preview]
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions you've considered.

.github/workflows/ci_e2e.yml

@@ -66,9 +66,9 @@ jobs:
         run: cd ./e2e && mvn -B clean test
       - name: Collect logs
         if: failure()
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         with:
           name: dslogs
-          path: /var/lib/docker/volumes/dolphinscheduler-logs/_data
+          path: ${{ github.workspace }}/docker/docker-swarm/dolphinscheduler-logs
 
 

.github/workflows/ci_ut.yml

@@ -62,15 +62,19 @@ jobs:
           git fetch origin
       - name: Compile
         run: |
-          export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
+          export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx5g'
           mvn test -B -Dmaven.test.skip=false
       - name: Upload coverage report to codecov
         run: |
           CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash)
+      # Set up JDK 11 for SonarCloud.
+      - name: Set up JDK 1.11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.11
       - name: Run SonarCloud Analysis
         run: >
-          mvn verify --batch-mode
-          org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.1.1688:sonar
+          mvn --batch-mode verify sonar:sonar
           -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml
           -Dmaven.test.skip=true
           -Dsonar.host.url=https://sonarcloud.io

LICENSE

@@ -199,3 +199,20 @@
    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.
+=======================================================================
+Apache DolphinScheduler (incubating) Subcomponents:
+
+The Apache DolphinScheduler (incubating) project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+========================================================================
+Apache 2.0 licenses
+========================================================================
+
+The following components are provided under the Apache License. See project link for details.
+The text of each license is the standard Apache 2.0 license.
+    ScriptRunner from https://github.com/mybatis/mybatis-3 Apache 2.0
+    mvnw files from https://github.com/takari/maven-wrapper Apache 2.0
+    PropertyPlaceholderHelper from https://github.com/spring-projects/spring-framework Apache 2.0

NOTICE

@@ -1,5 +1,87 @@
 Apache DolphinScheduler (incubating)
-Copyright 2019 The Apache Software Foundation
+Copyright 2019-2020 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
+
+mybatis-3
+iBATIS
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Copyright 2010 The Apache Software Foundation
+
+   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.
+
+OGNL
+//--------------------------------------------------------------------------
+//  Copyright (c) 2004, Drew Davidson and Luke Blanshard
+//  All rights reserved.
+//
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted provided that the following conditions are
+//  met:
+//
+//  Redistributions of source code must retain the above copyright notice,
+//  this list of conditions and the following disclaimer.
+//  Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//  Neither the name of the Drew Davidson nor the names of its contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+//  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+//  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+//  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+//  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+//  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+//  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+//  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+//  DAMAGE.
+//--------------------------------------------------------------------------
+
+Refactored SqlBuilder class (SQL, AbstractSQL)
+
+   This product includes software developed by
+   Adam Gent (https://gist.github.com/3650165)
+
+   Copyright 2010 Adam Gent
+
+   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.
+
+Spring Framework ${version}
+Copyright (c) 2002-${copyright} Pivotal, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0
+(the "License"). You may not use this product except in compliance with
+the License.
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the license.txt file.

README.md

@@ -55,20 +55,10 @@ Overload processing: Task queue mechanism, the number of schedulable tasks on a
 ![monitor](https://user-images.githubusercontent.com/59273635/75625839-c698a480-5bfc-11ea-8bbe-895b561b337f.png)
 ![security](https://user-images.githubusercontent.com/15833811/75236441-bfd2f180-57f8-11ea-88bd-f24311e01b7e.png)
 ![treeview](https://user-images.githubusercontent.com/15833811/75217191-3fe56100-57d1-11ea-8856-f19180d9a879.png)
-### Document
-
-- <a href="https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/backend-deployment.html" target="_blank">Backend deployment documentation</a>
-
-- <a href="https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/frontend-deployment.html" target="_blank">Front-end deployment documentation</a>
-
-- [**User manual**](https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/system-manual.html?_blank "System manual")
-
-- [**Upgrade document**](https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/upgrade.html?_blank "Upgrade document")
+### Online Demo
 
 - <a href="http://106.75.43.194:8888" target="_blank">Online Demo</a>
 
-More documentation please refer to <a href="https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/quick-start.html" target="_blank">[DolphinScheduler online documentation]</a>
-
 ### Recent R&D plan
 Work plan of Dolphin Scheduler: [R&D plan](https://github.com/apache/incubator-dolphinscheduler/projects/1), Under the `In Develop` card is what is currently being developed, TODO card is to be done (including feature ideas)
 
@@ -86,9 +76,8 @@ Welcome to participate in contributing, please refer to the process of submittin
 Artifact:
 
 ```
-dolphinscheduler-dist/dolphinscheduler-backend/target/apache-dolphinscheduler-incubating-${latest.release.version}-dolphinscheduler-backend-bin.tar.gz: Binary package of DolphinScheduler-Backend
-dolphinscheduler-dist/dolphinscheduler-front/target/apache-dolphinscheduler-incubating-${latest.release.version}-dolphinscheduler-front-bin.tar.gz: Binary package of DolphinScheduler-UI
-dolphinscheduler-dist/dolphinscheduler-src/target/apache-dolphinscheduler-incubating-${latest.release.version}-src.zip: Source code package of DolphinScheduler
+dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${latest.release.version}-dolphinscheduler-bin.tar.gz: Binary package of DolphinScheduler
+dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${latest.release.version}-src.zip: Source code package of DolphinScheduler
 ```
 
 ### Thanks

README_zh_CN.md

@@ -50,20 +50,10 @@ Dolphin Scheduler Official Website
 
 ![security](https://user-images.githubusercontent.com/15833811/75209633-baa28200-57b9-11ea-9def-94bef2e212a7.jpg)
 
-### 文档
-
-- <a href="https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/backend-deployment.html" target="_blank">后端部署文档</a>
-
-- <a href="https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/frontend-deployment.html" target="_blank">前端部署文档</a>
-
-- [**使用手册**](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/system-manual.html?_blank "系统使用手册")
-
-- [**升级文档**](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/upgrade.html?_blank "升级文档")
+### 我要体验
 
 - <a href="http://106.75.43.194:8888" target="_blank">我要体验</a>
 
-更多文档请参考 <a href="https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/quick-start.html" target="_blank">DolphinScheduler中文在线文档</a>
-
 
 ### 近期研发计划
 
@@ -83,9 +73,8 @@ DolphinScheduler的工作计划：<a href="https://github.com/apache/incubator-d
 Artifact:
 
 ```
-dolphinscheduler-dist/dolphinscheduler-backend/target/apache-dolphinscheduler-incubating-${latest.release.version}-dolphinscheduler-backend-bin.tar.gz: Binary package of DolphinScheduler-Backend
-dolphinscheduler-dist/dolphinscheduler-front/target/apache-dolphinscheduler-incubating-${latest.release.version}-dolphinscheduler-front-bin.tar.gz: Binary package of DolphinScheduler-UI
-dolphinscheduler-dist/dolphinscheduler-src/target/apache-dolphinscheduler-incubating-${latest.release.version}-src.zip: Source code package of DolphinScheduler
+dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${latest.release.version}-dolphinscheduler-bin.tar.gz: Binary package of DolphinScheduler
+dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${latest.release.version}-src.zip: Source code package of DolphinScheduler
 ```
 
 ### 感谢