Unverified Commit 5bac559d authored by bao liang's avatar bao liang Committed by GitHub
Browse files

Revert "branch dev merge from dev-1.3.0 (#3087)" (#3094) 



This reverts commit ab6e4310.

Co-authored-by: default avatardailidong <dailidong66@gmail.com>
parent ab6e4310

.github/workflows/ci_e2e.yml

+1 −1
Original line number Diff line number Diff line
@@ -69,6 +69,6 @@ jobs: 
        uses: actions/upload-artifact@v1

        with:

          name: dslogs

          path: /var/lib/docker/volumes/docker-swarm_dolphinscheduler-logs/_data

          path: /var/lib/docker/volumes/dolphinscheduler-logs/_data

.github/workflows/ci_ut.yml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 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 -Xmx5g'

          export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'

          mvn test -B -Dmaven.test.skip=false

      - name: Upload coverage report to codecov

        run: |

LICENSE

+0 −16
Original line number Diff line number Diff line
@@ -199,19 +199,3 @@ 
   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

NOTICE

+1 −71
Original line number Diff line number Diff line 
Apache DolphinScheduler (incubating)

Copyright 2019-2020 The Apache Software Foundation

Copyright 2019 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.
 
 No newline at end of file

README.md

+14 −3
Original line number Diff line number Diff line
@@ -55,10 +55,20 @@ 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)

### Online Demo

### 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")



- <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)
@@ -76,8 +86,9 @@ Welcome to participate in contributing, please refer to the process of submittin 
Artifact:



```

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

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

```



### Thanks