mirror of
https://gitee.com/dolphinscheduler/DolphinScheduler.git
synced 2024-12-04 21:28:00 +08:00
3b495d2fb0
* [BUG-#5678][Registry]fix registry init node miss (#5686) * [Improvement][UI] Update the update time after the user information is successfully modified (#5684) * improve edit the userinfo success, but the updatetime is not the latest. * Improved shell task execution result log information, adding process.waitFor() and process.exitValue() information to the original log (#5691) Co-authored-by: shenglm <shenglm840722@126.com> * [Feature-#5565][Master Worker-Server] Global Param passed by sense dependencies (#5603) * add globalParams new plan with varPool * add unit test * add python task varPoolParams Co-authored-by: wangxj <wangxj31> * Issue robot translation judgment changed to Chinese (#5694) Co-authored-by: chenxingchun <438044805@qq.com> * the update function should use post instead of get (#5703) * enhance form verify (#5696) * checkState only supports %s not {} (#5711) * [Fix-5701]When deleting a user, the accessToken associated with the user should also be deleted (#5697) * update * fix the codestyle error * fix the compile error * support rollback * [Fix-5699][UI] Fix update user error in user information (#5700) * [Improvement] the automatically generated spi service name in alert-plugin is wrong (#5676) * bug fix the auto generated spi service can't be recongized * include a new method * [Improvement-5622][project management] Modify the title (#5723) * [Fix-5714] When updating the existing alarm instance, the creation time should't be updated (#5715) * add a new init method. * [Fix#5758] There are some problems in the api documentation that need to be improved (#5759) * add the necessary parameters * openapi improve * fix code style error * [FIX-#5721][master-server] Global params parameter missing (#5757) Co-authored-by: wangxj <wangxj31> * [Fix-5738][UI] The cancel button in the pop-up dialog of `batch copy` and `batch move` doesn't work. (#5739) * Update relatedItems.vue * Update relatedItems.vue * [Improvement#5741][Worker] Improve task process status log (#5776) * [Improvement-5773][server] need to support two parameters related to task (#5774) * add some new parameter for task * restore official properties * improve imports * modify a variable's name Co-authored-by: jiang hua <jiang.hua@zhaopin.com.cn> * [FIX-5786][Improvement][Server] When the Worker turns down, the MasterServer cannot handle the Remove event correctly and throws NPE * [Improvement][Worker] Task log may be lost #5775 (#5783) * [Imporvement #5725][CheckStyle] upgrade checkstyle file (#5789) * [Imporvement #5725][CheckStyle] upgrade checkstyle file Upgrade checkstyle.xml to support checkstyle version 8.24+ * change ci checkstyle version * [Fix-5795][Improvement][Server] The starttime field in the HttpTask log is not displayed as expected. (#5796) * improve timestamp format make the startime in the log of httptask to be easier to read. * fix bad code smell and update the note. * [Imporvement #5621][job instance] start-time and end-time (#5621) (#5797) ·the list of workflow instances is sorted by start time and end time ·This closes #5621 * fix (#5803) Co-authored-by: shuangbofu <fusb@tuya.com> * fix: Remove duplicate "registryClient.close" method calls (#5805) Co-authored-by: wen-hemin <wenhemin@apache.com> * [Improvement][SPI] support load single plugin (#5794) change load operation of 'registry.plugin.dir' * [Improvement][Api Module] refactor registry client, remove spring annotation (#5814) * fix: refactor registry client, remove spring annotation * fix UT * fix UT * fix checkstyle * fix UT * fix UT * fix UT * fix: Rename RegistryCenterUtils method name Co-authored-by: wen-hemin <wenhemin@apache.com> * [Fix-5699][UI] Fix update user error in user information introduced by #5700 (#5735) * [Fix-5726] When we used the UI page, we found some problems such as parameter validation, parameter update shows success but actually work (#5727) * enhance the validation in UI * enchance form verifaction * simplify disable condition * fix: Remove unused class (#5833) Co-authored-by: wen-hemin <wenhemin@apache.com> * [fix-5737] [Bug][Datasource] datsource other param check error (#5835) Co-authored-by: wanggang <wanggy01@servyou.com.cn> * [Fix-5719][K8s] Fix Ingress tls: got map expected array On TLS enabled On Kubernetes [Fix-5719][K8s] Fix Ingress tls: got map expected array On TLS enabled On Kubernetes * [Fix-5825][BUG][WEB] the resource tree in the process definition of latest dev branch can't display correctly (#5826) * resoures-shows-error * fix codestyle error * add license header for new js * fix codesmell * [Improvement-5852][server] Support two parameters related to task for the rest of type of tasks. (#5867) * provide two system parameters to support the rest of type of tasks * provide two system parameters to support the rest of type of tasks * improve test conversion * [Improvement][Fix-5769][UI]When we try to delete the existing dag, the console in web browser would shows exception (#5770) * fix bug * cache the this variable * Avoid self name * fix code style compile error * [Fix-5781][UT] Fix test coverage in sonar (#5817) * build(UT): make jacoco running in offline-instrumentation issue: #5781 * build(UT): remove the jacoco agent dependency in microbench issue: #5781 * [Fix-5808][Server] When we try to transfer data using datax between different types of data sources, the worker will exit with ClassCastException (#5809) * bug fix * fix bug * simplify the code format * add a new parameter to make it easier to understand. * [Fix-5830][Improvement][UI] Improve the selection style in dag edit dialog (#5829) * improve the selection style * update another file * remove unnecessary css part. * [Fix-5904][upgrade]fix dev branch upgrade mysql sql script error (#5821) * fix dev branch upgrade mysql sql script error. * Update naming convention. * [Improvement][Api Module] refactor DataSourceParam and DependentParam, remove spring annotation (#5832) * fix: refactor api utils class, remove spring annotation. * fix: Optimization comments Co-authored-by: wen-hemin <wenhemin@apache.com> * correct the wrong annotion from zk queue implemented to java priority blocking queue (#5906) Co-authored-by: ywang46 <ywang46@paypal.com> * Add a Gitter chat badge to README.md (#5883) * Add Gitter badge * Update README.md Co-authored-by: David <dailidong66@gmail.com> * ci: improve maven connection in CI builds (#5924) issue: #5921 * [Improvement][Master]fix typo (#5934) ·fix typo in MasterBaseTaskExecThread * [Fix-5886][server] Enhanced scheduler delete check (#5936) * Add:Name verification remove the first and last spaces. * Update: wrong word: 'WAITTING' ->'WAITING' * Add: Strengthen verification Co-authored-by: Squid <2824638304@qq.com> * [Improvement-5880][api] Optimized data structure of pagination query API results (#5895) * [5880][refactor]Optimized data structure of pagination query API results - refactor PageInfo and delete returnDataListPaging in API - modify the related Controller and Service and the corresponding Test * Merge branch 'dev' of github.com:apache/dolphinscheduler into dev Conflicts: dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java Co-authored-by: 蔡泽华 <sorea1k@163.com> * [IMPROVEMENT]fix mysql comment error (#5959) * [Improvement][Api]fix typo (#5960) * [Imporvement #5621][job instance] start-time and end-time (#5621) ·the list of workflow instances is sorted by start time and end time ·This closes #5621 * [FIX-5975]queryLastRunningProcess sql in ProcessInstanceMapper.xml (#5980) * [NEW FEATURE][FIX-4385] compensation task add the ability to configure parallelism (#5912) * update * web improved * improve the ui * add the ability to configure the parallelism * update variables * enhance the ut and add necessary note * fix code style * fix code style issue * ensure the complation task in parallel mode can run the right numbers of tasks. * [Improvement][dao]When I search for the keyword description, the web UI shows empty (#5952) * [Bug][WorkerServer] SqlTask NullPointerException #5549 * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428 * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428 * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428 * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428 * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428 * [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428 * [Improvement][dao]When I search for the keyword description, the web UI shows empty #5428 * fix the readme typing issue (#5998) * Fix unchecked type conversions * Use indentation level reported by checkstyle * Reorganize CI workflows to fasten the wasted time and resources (#6011) * Add standalone server module to make it easier to develop (#6022) * fix ut Co-authored-by: Kirs <acm_master@163.com> Co-authored-by: kyoty <echohlne@gmail.com> Co-authored-by: ji04xiaogang <ji04xiaogang@163.com> Co-authored-by: shenglm <shenglm840722@126.com> Co-authored-by: wangxj3 <857234426@qq.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> Co-authored-by: chenxingchun <438044805@qq.com> Co-authored-by: Shiwen Cheng <chengshiwen0103@gmail.com> Co-authored-by: Jianchao Wang <akingchao@qq.com> Co-authored-by: Tanvi Moharir <74228962+tanvimoharir@users.noreply.github.com> Co-authored-by: Hua Jiang <jianghuachinacom@163.com> Co-authored-by: jiang hua <jiang.hua@zhaopin.com.cn> Co-authored-by: Wenjun Ruan <861923274@qq.com> Co-authored-by: Tandoy <56899730+Tandoy@users.noreply.github.com> Co-authored-by: 傅双波 <786183073@qq.com> Co-authored-by: shuangbofu <fusb@tuya.com> Co-authored-by: wen-hemin <39549317+wen-hemin@users.noreply.github.com> Co-authored-by: wen-hemin <wenhemin@apache.com> Co-authored-by: geosmart <geosmart@hotmail.com> Co-authored-by: wanggang <wanggy01@servyou.com.cn> Co-authored-by: AzureCN <colorazure@163.com> Co-authored-by: 深刻 <tsund@qq.com> Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com> Co-authored-by: Yao WANG <Yao.MR.CN@gmail.com> Co-authored-by: ywang46 <ywang46@paypal.com> Co-authored-by: The Gitter Badger <badger@gitter.im> Co-authored-by: David <dailidong66@gmail.com> Co-authored-by: Squidyu <1297554122@qq.com> Co-authored-by: Squid <2824638304@qq.com> Co-authored-by: soreak <60459867+soreak@users.noreply.github.com> Co-authored-by: 蔡泽华 <sorea1k@163.com> Co-authored-by: yimaixinchen <yimaixinchen@163.com> Co-authored-by: atai-555 <74188560+atai-555@users.noreply.github.com> Co-authored-by: didiaode18 <563646039@qq.com> Co-authored-by: Roy <yongjuncao1213@gmail.com> Co-authored-by: lyxell <alyxell@kth.se> Co-authored-by: Wenjun Ruan <wenjun@apache.org> Co-authored-by: kezhenxu94 <kezhenxu94@apache.org> Co-authored-by: JinyLeeChina <297062848@qq.com>
386 lines
19 KiB
XML
386 lines
19 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!--
|
|
~ Licensed to the Apache Software Foundation (ASF) under one or more
|
|
~ contributor license agreements. See the NOTICE file distributed with
|
|
~ this work for additional information regarding copyright ownership.
|
|
~ The ASF licenses this file to You 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.
|
|
-->
|
|
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<parent>
|
|
<artifactId>dolphinscheduler</artifactId>
|
|
<groupId>org.apache.dolphinscheduler</groupId>
|
|
<version>1.3.6-SNAPSHOT</version>
|
|
</parent>
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<artifactId>dolphinscheduler-dist</artifactId>
|
|
<packaging>provisio</packaging>
|
|
<name>${project.artifactId}</name>
|
|
<properties>
|
|
<maven.deploy.skip>true</maven.deploy.skip>
|
|
</properties>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.apache.dolphinscheduler</groupId>
|
|
<artifactId>dolphinscheduler-server</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.dolphinscheduler</groupId>
|
|
<artifactId>dolphinscheduler-standalone-server</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.dolphinscheduler</groupId>
|
|
<artifactId>dolphinscheduler-api</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.dolphinscheduler</groupId>
|
|
<artifactId>dolphinscheduler-alert</artifactId>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
<profiles>
|
|
<profile>
|
|
<id>release</id>
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<artifactId>maven-assembly-plugin</artifactId>
|
|
<executions>
|
|
<execution>
|
|
<id>dolphinscheduler-bin</id>
|
|
<phase>package</phase>
|
|
<goals>
|
|
<goal>single</goal>
|
|
</goals>
|
|
|
|
<configuration>
|
|
<descriptors>
|
|
<descriptor>src/main/assembly/dolphinscheduler-bin.xml</descriptor>
|
|
</descriptors>
|
|
<appendAssemblyId>true</appendAssemblyId>
|
|
</configuration>
|
|
</execution>
|
|
|
|
<execution>
|
|
<id>src</id>
|
|
<phase>package</phase>
|
|
<goals>
|
|
<goal>single</goal>
|
|
</goals>
|
|
<configuration>
|
|
<descriptors>
|
|
<descriptor>src/main/assembly/dolphinscheduler-src.xml</descriptor>
|
|
</descriptors>
|
|
<appendAssemblyId>true</appendAssemblyId>
|
|
</configuration>
|
|
</execution>
|
|
|
|
</executions>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-source-plugin</artifactId>
|
|
<executions>
|
|
<execution>
|
|
<id>attach-sources</id>
|
|
<phase>verify</phase>
|
|
<goals>
|
|
<goal>jar-no-fork</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
</profile>
|
|
|
|
<profile>
|
|
<id>rpmbuild</id>
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-dependency-plugin</artifactId>
|
|
<configuration>
|
|
<outputDirectory>${project.build.directory}/lib</outputDirectory>
|
|
<overWriteReleases>false</overWriteReleases>
|
|
<overWriteSnapshots>false</overWriteSnapshots>
|
|
<overWriteIfNewer>true</overWriteIfNewer>
|
|
<excludeScope>provided</excludeScope>
|
|
</configuration>
|
|
<executions>
|
|
<execution>
|
|
<id>copy-dependencies</id>
|
|
<phase>package</phase>
|
|
<goals>
|
|
<goal>copy-dependencies</goal>
|
|
</goals>
|
|
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>rpm-maven-plugin</artifactId>
|
|
<extensions>true</extensions>
|
|
<executions>
|
|
<execution>
|
|
<phase>package</phase>
|
|
<goals>
|
|
<goal>attached-rpm</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
|
|
<configuration>
|
|
<name>apache-dolphinscheduler</name>
|
|
<release>1</release>
|
|
<distribution>apache dolphinscheduler rpm</distribution>
|
|
<group>apache</group>
|
|
<packager>dolphinscheduler</packager>
|
|
<!-- <version>${project.version}</version> -->
|
|
<prefix>/opt/soft</prefix>
|
|
<autoRequires>false</autoRequires>
|
|
<defineStatements>
|
|
<!-- disable compile python when rpm build -->
|
|
<defineStatement>__os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')</defineStatement>
|
|
</defineStatements>
|
|
<mappings>
|
|
<mapping>
|
|
<directory>/opt/soft/${project.build.finalName}/conf</directory>
|
|
<filemode>755</filemode>
|
|
<username>root</username>
|
|
<groupname>root</groupname>
|
|
<sources>
|
|
<source>
|
|
<location>
|
|
${basedir}/../dolphinscheduler-alert/src/main/resources
|
|
</location>
|
|
<includes>
|
|
<include>**/*.*</include>
|
|
</includes>
|
|
</source>
|
|
|
|
<source>
|
|
<location>
|
|
${basedir}/../dolphinscheduler-common/src/main/resources
|
|
</location>
|
|
<includes>
|
|
<include>**/*.*</include>
|
|
</includes>
|
|
</source>
|
|
|
|
<source>
|
|
<location>
|
|
${basedir}/../dolphinscheduler-dao/src/main/resources
|
|
</location>
|
|
<includes>
|
|
<include>**/*.*</include>
|
|
</includes>
|
|
</source>
|
|
|
|
<source>
|
|
<location>
|
|
${basedir}/../dolphinscheduler-api/src/main/resources
|
|
</location>
|
|
<includes>
|
|
<include>**/*.*</include>
|
|
</includes>
|
|
</source>
|
|
|
|
<source>
|
|
<location>
|
|
${basedir}/../dolphinscheduler-server/src/main/resources
|
|
</location>
|
|
<includes>
|
|
<include>config/*.*</include>
|
|
<include>**/*.xml</include>
|
|
</includes>
|
|
</source>
|
|
|
|
<source>
|
|
<location>
|
|
${basedir}/../dolphinscheduler-service/src/main/resources
|
|
</location>
|
|
<includes>
|
|
<include>*.*</include>
|
|
</includes>
|
|
</source>
|
|
|
|
<source>
|
|
<location>
|
|
${basedir}/../script
|
|
</location>
|
|
<includes>
|
|
<include>env/*.*</include>
|
|
</includes>
|
|
</source>
|
|
|
|
|
|
</sources>
|
|
</mapping>
|
|
<mapping>
|
|
<directory>/opt/soft/${project.build.finalName}/lib</directory>
|
|
<filemode>755</filemode>
|
|
<username>root</username>
|
|
<groupname>root</groupname>
|
|
|
|
<sources>
|
|
<source>
|
|
<location>
|
|
${basedir}/../dolphinscheduler-dist/target/lib
|
|
</location>
|
|
<includes>
|
|
<include>*.*</include>
|
|
</includes>
|
|
<excludes>
|
|
<exclude>servlet-api-*.jar</exclude>
|
|
<exclude>slf4j-log4j12-${slf4j.log4j12.version}.jar</exclude>
|
|
</excludes>
|
|
</source>
|
|
</sources>
|
|
</mapping>
|
|
<mapping>
|
|
<directory>/opt/soft/${project.build.finalName}/bin</directory>
|
|
<filemode>755</filemode>
|
|
<username>root</username>
|
|
<groupname>root</groupname>
|
|
<sources>
|
|
|
|
<source>
|
|
<location>
|
|
${basedir}/../script
|
|
</location>
|
|
<includes>
|
|
<include>start-all.sh</include>
|
|
<include>stop-all.sh</include>
|
|
<include>dolphinscheduler-daemon.sh</include>
|
|
<include>status-all.sh</include>
|
|
</includes>
|
|
</source>
|
|
</sources>
|
|
</mapping>
|
|
<mapping>
|
|
<directory>/opt/soft/${project.build.finalName}</directory>
|
|
<filemode>755</filemode>
|
|
<username>root</username>
|
|
<groupname>root</groupname>
|
|
<sources>
|
|
<source>
|
|
<location>
|
|
${basedir}/../
|
|
</location>
|
|
<includes>
|
|
<include>*.sh</include>
|
|
<include>*.py</include>
|
|
<include>DISCLAIMER</include>
|
|
</includes>
|
|
</source>
|
|
|
|
<source>
|
|
<location>
|
|
${basedir}/release-docs
|
|
</location>
|
|
<includes>
|
|
<include>**/*</include>
|
|
</includes>
|
|
</source>
|
|
|
|
</sources>
|
|
</mapping>
|
|
<mapping>
|
|
<directory>/opt/soft/${project.build.finalName}/ui</directory>
|
|
<filemode>755</filemode>
|
|
<username>root</username>
|
|
<groupname>root</groupname>
|
|
<sources>
|
|
<source>
|
|
<location>
|
|
${basedir}/../dolphinscheduler-ui/dist
|
|
</location>
|
|
<includes>
|
|
<include>**/*.*</include>
|
|
</includes>
|
|
</source>
|
|
</sources>
|
|
</mapping>
|
|
<mapping>
|
|
<directory>/opt/soft/${project.build.finalName}/sql</directory>
|
|
<filemode>755</filemode>
|
|
<username>root</username>
|
|
<groupname>root</groupname>
|
|
<sources>
|
|
<source>
|
|
<location>
|
|
${basedir}/../sql
|
|
</location>
|
|
<includes>
|
|
<include>**/*.*</include>
|
|
</includes>
|
|
</source>
|
|
<source>
|
|
<location>
|
|
${basedir}/../sql
|
|
</location>
|
|
<includes>
|
|
<include>soft_version</include>
|
|
</includes>
|
|
</source>
|
|
</sources>
|
|
</mapping>
|
|
|
|
<mapping>
|
|
<directory>/opt/soft/${project.build.finalName}/script</directory>
|
|
<filemode>755</filemode>
|
|
<username>root</username>
|
|
<groupname>root</groupname>
|
|
<sources>
|
|
<source>
|
|
<location>
|
|
${basedir}/../script
|
|
</location>
|
|
<includes>
|
|
<include>*.sh</include>
|
|
</includes>
|
|
</source>
|
|
|
|
</sources>
|
|
</mapping>
|
|
</mappings>
|
|
|
|
<preinstallScriptlet>
|
|
<script>mkdir -p /opt/soft</script>
|
|
</preinstallScriptlet>
|
|
<postinstallScriptlet>
|
|
<script>rm -rf /opt/soft/dolphinscheduler ; ln -s /opt/soft/apache-dolphinscheduler-${project.version} /opt/soft/dolphinscheduler</script>
|
|
</postinstallScriptlet>
|
|
<postremoveScriptlet>
|
|
<script>rm -rf /opt/soft/apache-dolphinscheduler-${project.version}</script>
|
|
</postremoveScriptlet>
|
|
</configuration>
|
|
</plugin>
|
|
|
|
</plugins>
|
|
</build>
|
|
</profile>
|
|
|
|
</profiles>
|
|
|
|
</project>
|