Merge branch 'dev' into issue/1463 (91f64a1a) · Commits · SUMMER2020 / students / proj-2002251

.github/workflows/ci_backend.yml

+5 −17

Original line number	Diff line number	Diff line
		@@ -56,21 +56,9 @@ jobs:
		uses: actions/setup-java@v1
		with:
		java-version: 1.8
		- name: Check license
		run: ./mvnw -B apache-rat:check
		- name: Compile
		run: mvn -B clean compile package -Prelease -Dmaven.test.skip=true
		License-check:
		runs-on: ubuntu-latest
		steps:
		- uses: actions/checkout@v2
		# In the checkout@v2, it doesn't support git submodule. Execute the commands manually.
		- name: checkout submodules
		shell: bash
		run: \|
		git submodule sync --recursive
		git -c protocol.version=2 submodule update --init --force --recursive --depth=1
		- name: Set up JDK 1.8
		uses: actions/setup-java@v1
		with:
		java-version: 1.8
		- name: Check
		run: mvn -B apache-rat:check
		run: mvn -B clean compile install -Prelease -Dmaven.test.skip=true
		- name: Check dependency license
		run: tools/dependencies/check-LICENSE.sh

.gitignore

+11 −114

Original line number	Diff line number	Diff line
		@@ -4,27 +4,24 @@
		.zip
		.gz
		.DS_Store
		.idea
		.idea/
		.idea/*
		.target
		.target/
		//target/**
		target/*
		*/target
		/target/
		dist/
		all-dependencies.txt
		self-modules.txt
		third-party-dependencies.txt
		**/target/
		.settings
		.nbproject
		.classpath
		.project
		*.iml
		*/.iml
		*.ipr
		*.iws
		*.tgz
		.*.swp
		.vim
		.tmp
		node_modules
		**/node_modules
		npm-debug.log
		.vscode
		logs/*
		@@ -41,110 +38,10 @@ dolphinscheduler-alert/logs/
		dolphinscheduler-alert/src/main/resources/alert.properties_bak
		dolphinscheduler-alert/src/main/resources/logback.xml
		dolphinscheduler-server/src/main/resources/logback.xml
		dolphinscheduler-ui/dist
		dolphinscheduler-ui/dist/
		dolphinscheduler-ui/node
		dolphinscheduler-ui/dist/css/common.16ac5d9.css
		dolphinscheduler-ui/dist/css/home/index.b444b91.css
		dolphinscheduler-ui/dist/css/login/index.5866c64.css
		dolphinscheduler-ui/dist/js/0.ac94e5d.js
		dolphinscheduler-ui/dist/js/0.ac94e5d.js.map
		dolphinscheduler-ui/dist/js/1.0b043a3.js
		dolphinscheduler-ui/dist/js/1.0b043a3.js.map
		dolphinscheduler-ui/dist/js/10.1bce3dc.js
		dolphinscheduler-ui/dist/js/10.1bce3dc.js.map
		dolphinscheduler-ui/dist/js/11.79f04d8.js
		dolphinscheduler-ui/dist/js/11.79f04d8.js.map
		dolphinscheduler-ui/dist/js/12.420daa5.js
		dolphinscheduler-ui/dist/js/12.420daa5.js.map
		dolphinscheduler-ui/dist/js/13.e5bae1c.js
		dolphinscheduler-ui/dist/js/13.e5bae1c.js.map
		dolphinscheduler-ui/dist/js/14.f2a0dca.js
		dolphinscheduler-ui/dist/js/14.f2a0dca.js.map
		dolphinscheduler-ui/dist/js/15.45373e8.js
		dolphinscheduler-ui/dist/js/15.45373e8.js.map
		dolphinscheduler-ui/dist/js/16.fecb0fc.js
		dolphinscheduler-ui/dist/js/16.fecb0fc.js.map
		dolphinscheduler-ui/dist/js/17.84be279.js
		dolphinscheduler-ui/dist/js/17.84be279.js.map
		dolphinscheduler-ui/dist/js/18.307ea70.js
		dolphinscheduler-ui/dist/js/18.307ea70.js.map
		dolphinscheduler-ui/dist/js/19.144db9c.js
		dolphinscheduler-ui/dist/js/19.144db9c.js.map
		dolphinscheduler-ui/dist/js/2.8b4ef29.js
		dolphinscheduler-ui/dist/js/2.8b4ef29.js.map
		dolphinscheduler-ui/dist/js/20.4c527e9.js
		dolphinscheduler-ui/dist/js/20.4c527e9.js.map
		dolphinscheduler-ui/dist/js/21.831b2a2.js
		dolphinscheduler-ui/dist/js/21.831b2a2.js.map
		dolphinscheduler-ui/dist/js/22.2b4bb2a.js
		dolphinscheduler-ui/dist/js/22.2b4bb2a.js.map
		dolphinscheduler-ui/dist/js/23.81467ef.js
		dolphinscheduler-ui/dist/js/23.81467ef.js.map
		dolphinscheduler-ui/dist/js/24.54a00e4.js
		dolphinscheduler-ui/dist/js/24.54a00e4.js.map
		dolphinscheduler-ui/dist/js/25.8d7bd36.js
		dolphinscheduler-ui/dist/js/25.8d7bd36.js.map
		dolphinscheduler-ui/dist/js/26.2ec5e78.js
		dolphinscheduler-ui/dist/js/26.2ec5e78.js.map
		dolphinscheduler-ui/dist/js/27.3ab48c2.js
		dolphinscheduler-ui/dist/js/27.3ab48c2.js.map
		dolphinscheduler-ui/dist/js/28.363088a.js
		dolphinscheduler-ui/dist/js/28.363088a.js.map
		dolphinscheduler-ui/dist/js/29.6c5853a.js
		dolphinscheduler-ui/dist/js/29.6c5853a.js.map
		dolphinscheduler-ui/dist/js/3.a0edb5b.js
		dolphinscheduler-ui/dist/js/3.a0edb5b.js.map
		dolphinscheduler-ui/dist/js/30.940fdd3.js
		dolphinscheduler-ui/dist/js/30.940fdd3.js.map
		dolphinscheduler-ui/dist/js/31.168a460.js
		dolphinscheduler-ui/dist/js/31.168a460.js.map
		dolphinscheduler-ui/dist/js/32.8df6594.js
		dolphinscheduler-ui/dist/js/32.8df6594.js.map
		dolphinscheduler-ui/dist/js/33.4480bbe.js
		dolphinscheduler-ui/dist/js/33.4480bbe.js.map
		dolphinscheduler-ui/dist/js/34.b407fe1.js
		dolphinscheduler-ui/dist/js/34.b407fe1.js.map
		dolphinscheduler-ui/dist/js/35.f340b0a.js
		dolphinscheduler-ui/dist/js/35.f340b0a.js.map
		dolphinscheduler-ui/dist/js/36.8880c2d.js
		dolphinscheduler-ui/dist/js/36.8880c2d.js.map
		dolphinscheduler-ui/dist/js/37.ea2a25d.js
		dolphinscheduler-ui/dist/js/37.ea2a25d.js.map
		dolphinscheduler-ui/dist/js/38.98a59ee.js
		dolphinscheduler-ui/dist/js/38.98a59ee.js.map
		dolphinscheduler-ui/dist/js/39.a5e958a.js
		dolphinscheduler-ui/dist/js/39.a5e958a.js.map
		dolphinscheduler-ui/dist/js/4.4ca44db.js
		dolphinscheduler-ui/dist/js/4.4ca44db.js.map
		dolphinscheduler-ui/dist/js/40.e187b1e.js
		dolphinscheduler-ui/dist/js/40.e187b1e.js.map
		dolphinscheduler-ui/dist/js/41.0e89182.js
		dolphinscheduler-ui/dist/js/41.0e89182.js.map
		dolphinscheduler-ui/dist/js/42.341047c.js
		dolphinscheduler-ui/dist/js/42.341047c.js.map
		dolphinscheduler-ui/dist/js/43.27b8228.js
		dolphinscheduler-ui/dist/js/43.27b8228.js.map
		dolphinscheduler-ui/dist/js/44.e8869bc.js
		dolphinscheduler-ui/dist/js/44.e8869bc.js.map
		dolphinscheduler-ui/dist/js/45.8d54901.js
		dolphinscheduler-ui/dist/js/45.8d54901.js.map
		dolphinscheduler-ui/dist/js/5.e1ed7f3.js
		dolphinscheduler-ui/dist/js/5.e1ed7f3.js.map
		dolphinscheduler-ui/dist/js/6.241ba07.js
		dolphinscheduler-ui/dist/js/6.241ba07.js.map
		dolphinscheduler-ui/dist/js/7.ab2e297.js
		dolphinscheduler-ui/dist/js/7.ab2e297.js.map
		dolphinscheduler-ui/dist/js/8.83ff814.js
		dolphinscheduler-ui/dist/js/8.83ff814.js.map
		dolphinscheduler-ui/dist/js/9.39cb29f.js
		dolphinscheduler-ui/dist/js/9.39cb29f.js.map
		dolphinscheduler-ui/dist/js/common.733e342.js
		dolphinscheduler-ui/dist/js/common.733e342.js.map
		dolphinscheduler-ui/dist/js/home/index.78a5d12.js
		dolphinscheduler-ui/dist/js/home/index.78a5d12.js.map
		dolphinscheduler-ui/dist/js/login/index.291b8e3.js
		dolphinscheduler-ui/dist/js/login/index.291b8e3.js.map
		dolphinscheduler-ui/dist/lib/external/
		/dolphinscheduler-dao/src/main/resources/dao/data_source.properties
		dolphinscheduler-dao/src/main/resources/dao/data_source.properties

		.mvn/wrapper/*.jar

		!/zookeeper_data/

dolphinscheduler-dist/release-docs/LICENSE

+0 −1

Original line number	Diff line number	Diff line
		@@ -474,7 +474,6 @@ The following components are provided under a MIT 2.0 license. See project link
		The text of each license is also included at licenses/LICENSE-[project].txt.

		jul-to-slf4j 1.7.25: https://mvnrepository.com/artifact/org.slf4j/jul-to-slf4j/1.7.25, MIT
		lombok 1.18.6: https://mvnrepository.com/artifact/org.projectlombok/lombok/1.18.6, MIT
		mssql-jdbc 6.1.0.jre8: https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc/6.1.0.jre8, MIT
		slf4j-api 1.7.5: https://mvnrepository.com/artifact/org.slf4j/slf4j-api/1.7.5, MIT

dolphinscheduler-dist/release-docs/licenses/LICENSE-lombok.txt

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		Copyright (C) 2009-2015 The Project Lombok Authors.

		Permission is hereby granted, free of charge, to any person obtaining a copy
		of this software and associated documentation files (the "Software"), to deal
		in the Software without restriction, including without limitation the rights
		to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		copies of the Software, and to permit persons to whom the Software is
		furnished to do so, subject to the following conditions:

		The above copyright notice and this permission notice shall be included in
		all copies or substantial portions of the Software.

		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
		AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
		OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
		THE SOFTWARE.

dolphinscheduler-ui/package.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@
		"html-loader": "^0.5.5",
		"html-webpack-plugin": "^3.2.0",
		"mini-css-extract-plugin": "^0.8.2",
		"node-sass": "^4.13.1",
		"node-sass": "^4.14.0",
		"postcss-loader": "^3.0.0",
		"progress-bar-webpack-plugin": "^1.12.1",
		"rimraf": "^2.6.2",