Skip to content

remove antrun plugin#1292

Merged
qiaozhanwei merged 218 commits intoapache:1.2.0-releasefrom
lgcareer:1.2.0-release
Nov 19, 2019
Merged

remove antrun plugin#1292
qiaozhanwei merged 218 commits intoapache:1.2.0-releasefrom
lgcareer:1.2.0-release

Conversation

@lgcareer
Copy link
Copy Markdown
Contributor

@lgcareer lgcareer commented Nov 19, 2019

remove antrun plugin

@lgcareer
rename from DatasourceUserMapper to DataSourceUserMapper
1412687
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
b15b2ab
@lgcareer
add unit test in UserMapper and WorkerGroupMapper
01f9ae3
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
36a1d0c
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
837dd03
@lgcareer
change cn.escheduler to org.apache.dolphinscheduler
02f6d8a
@lgcareer
add unit test in UdfFuncMapperTest
ae3bdaf
@lgcareer
add unit test in UdfFuncMapperTest
eef6001
@lgcareer
add unit test in UdfFuncMapperTest
eb8be33
@lgcareer
remove DatabaseConfiguration
b3bfce9
@lgcareer
add ConnectionFactoryTest
b36325b
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
0e18a03
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
5b43dbb
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
e049235
@lgcareer
cal duration in processInstancesList
757314c
@lgcareer
change desc to description
7722dd5
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
d808ddf
@lgcareer
change table name in mysql ddl
0a49c78
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
2836b09
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
3d1a765
@lgcareer
change table name in mysql ddl
7e2aa2b
@lgcareer
change escheduler to dolphinscheduler
6884d02
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
695fd81
@lgcareer
change escheduler to dolphinscheduler
22f7d50
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
acab7b7
@lgcareer
change escheduler to dolphinscheduler
ad3fca8
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
b11f8e6
@lgcareer
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
194c785
@lgcareer
remove log4j-1.2-api and modify AlertMapperTest
ab6d9d1
@lgcareer
remove log4j-1.2-api
bab7d37
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
72c72d4 
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
add DISCLAIMER
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
07a80b6 
…2.0-release
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
86819a5 
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
add license in xml and properties
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
181e88f 
…2.0-release
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
d3a8697 
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
add license in dockerfile
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
afb88a2 
…2.0-release
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
e4bdbf1 
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
add license in script and sql
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
5c5271a 
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
add license in script and sql
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
ea47dbe 
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
add license in ci
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
9ed44cc 
…2.0-release
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
5af810d 
…2.0-release
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
fd5d815 
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
change version to 1.2.0-SNAPSHOT
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
c7a5d4e 
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
change verison 1.2.1-SNAPSHOT
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
ae985e9 
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
set defalut db type postgresql
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
8b30b6c 
…2.0-release

# Conflicts:
#	dolphinscheduler-alert/pom.xml
#	dolphinscheduler-api/pom.xml
#	dolphinscheduler-common/pom.xml
#	dolphinscheduler-dao/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
#	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
#	dolphinscheduler-dist/pom.xml
#	dolphinscheduler-rpc/pom.xml
#	dolphinscheduler-server/pom.xml
#	dolphinscheduler-ui/pom.xml
#	pom.xml
set defalut db type postgresql
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
d6efa1c 
…2.0-release
@lgcareer
change org.quartz.jobStore.driverDelegateClass
20a4adb
@lgcareer
Add comments in method params
ed9313c
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
26dce39 
…2.0-release
@lgcareer
update readme from branch dev
bce4d7e
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
a780bea 
…2.0-release
@lgcareer
update content in how to contribute
53aa009
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
833b7dd 
…2.0-release
@lgcareer
change postgresql default port
9b3229c
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
6bc32c6 
…2.0-release
@lgcareer
change version 1.2.0-SNAPSHOT
45e98e2
@lgcareer
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
c836a98 
…2.0-release
@lgcareer
remove antrun plugin
542ac53
qiaozhanwei
qiaozhanwei reviewed Nov 19, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@qiaozhanwei qiaozhanwei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@qiaozhanwei qiaozhanwei merged commit 2770691 into apache:1.2.0-release Nov 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@qiaozhanwei qiaozhanwei qiaozhanwei left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@lgcareer @qiaozhanwei @jmy1944311667 @khadgarmage @break60 @Technoboy- @lenboo