This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch 1.3.6-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.6-prepare by this push:
new 9500d8e [Graduation] Modify the graduation version (#5177)
9500d8e is described below
commit 9500d8e3259449dc60f33ac715900a6f42ada658
Author: Kirs <[email protected]>
AuthorDate: Wed Mar 31 08:58:25 2021 +0800
[Graduation] Modify the graduation version (#5177)
* [Graduation] Modify the graduation version
Remove DISCLAIMER
rename release package name
* [Graduation] Modify the graduation version
Remove DISCLAIMER
rename release package name
* code style
---
DISCLAIMER | 5 -----
LICENSE | 4 ++--
NOTICE | 2 +-
README.md | 4 ++--
README_zh_CN.md | 4 ++--
ambari_plugin/README.md | 4 ++--
ambari_plugin/common-services/DOLPHIN/1.3.5/metainfo.xml | 2 +-
docker/build/Dockerfile | 4 ++--
docker/build/hooks/build | 4 ++--
docker/build/hooks/build.bat | 4 ++--
dolphinscheduler-dist/pom.xml | 8 ++++----
dolphinscheduler-dist/release-docs/NOTICE | 2 +-
pom.xml | 2 +-
13 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 1c269cd..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache DolphinScheduler (incubating) is an effort undergoing incubation at The
Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-Incubation is required of all newly accepted projects until a further review
indicates that the infrastructure,
-communications, and decision making process have stabilized in a manner
consistent with other successful ASF projects.
-While incubation status is not necessarily a reflection of the completeness or
stability of the code,
-it does indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/LICENSE b/LICENSE
index 9a0c6aa..1efafc7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,9 +200,9 @@
See the License for the specific language governing permissions and
limitations under the License.
=======================================================================
-Apache DolphinScheduler (incubating) Subcomponents:
+Apache DolphinScheduler Subcomponents:
-The Apache DolphinScheduler (incubating) project contains subcomponents with
separate copyright
+The Apache DolphinScheduler 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.
diff --git a/NOTICE b/NOTICE
index 1d83b0f..850efae 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache DolphinScheduler (incubating)
+Apache DolphinScheduler
Copyright 2019-2021 The Apache Software Foundation
This product includes software developed at
diff --git a/README.md b/README.md
index 0c933f6..ede3de1 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Please referer the official website document: [QuickStart in
Kubernetes](https:/
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/target/apache-dolphinscheduler-${latest.release.version}-dolphinscheduler-bin.tar.gz:
Binary package of DolphinScheduler
+dolphinscheduler-dist/target/apache-dolphinscheduler-${latest.release.version}-src.zip:
Source code package of DolphinScheduler
```
## Thanks
diff --git a/README_zh_CN.md b/README_zh_CN.md
index abd3d37..31f632f 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -76,8 +76,8 @@ DolphinScheduler的工作计划：<a
href="https://github.com/apache/incubator-d
制品:
```
-dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${latest.release.version}-dolphinscheduler-bin.tar.gz:
DolphinScheduler 二进制包
-dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${latest.release.version}-src.zip:
DolphinScheduler 源代码包
+dolphinscheduler-dist/target/apache-dolphinscheduler-${latest.release.version}-dolphinscheduler-bin.tar.gz:
DolphinScheduler 二进制包
+dolphinscheduler-dist/target/apache-dolphinscheduler-${latest.release.version}-src.zip:
DolphinScheduler 源代码包
```
## 感谢
diff --git a/ambari_plugin/README.md b/ambari_plugin/README.md
index 1778266..25fa915 100644
--- a/ambari_plugin/README.md
+++ b/ambari_plugin/README.md
@@ -10,7 +10,7 @@
1. Prepare the RPM packages
- - It is generated by executing the command ```mvn -U clean install
-Prpmbuild -Dmaven.test.skip=true -X``` in the project root directory (In the
directory:
dolphinscheduler-dist/target/rpm/apache-dolphinscheduler-incubating/RPMS/noarch
)
+ - It is generated by executing the command ```mvn -U clean install
-Prpmbuild -Dmaven.test.skip=true -X``` in the project root directory (In the
directory: dolphinscheduler-dist/target/rpm/apache-dolphinscheduler/RPMS/noarch
)
2. Create an installation for DS，who have read and write access to the
installation directory (/opt/soft)
@@ -18,7 +18,7 @@
- Manual installation (recommended）：
- Copy the prepared RPM packages to each node of the cluster.
- - Execute with DS installation user: ```rpm -ivh
apache-dolphinscheduler-incubating-xxx.noarch.rpm```
+ - Execute with DS installation user: ```rpm -ivh
apache-dolphinscheduler-xxx.noarch.rpm```
- Mysql-connector-java packaged using the default POM file will not be
included.
- The RPM package was packaged in the project with the installation path
of /opt/soft.
If you use mysql as the database, you need add it manually.
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.5/metainfo.xml
b/ambari_plugin/common-services/DOLPHIN/1.3.5/metainfo.xml
index ac65d93..a60d213 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.3.5/metainfo.xml
+++ b/ambari_plugin/common-services/DOLPHIN/1.3.5/metainfo.xml
@@ -103,7 +103,7 @@
<osFamily>any</osFamily>
<packages>
<package>
- <name>apache-dolphinscheduler-incubating*</name>
+ <name>apache-dolphinscheduler*</name>
</package>
</packages>
</osSpecific>
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
index e4f5c2c..3c96b25 100644
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -40,8 +40,8 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/* /tmp/*
# 2. add dolphinscheduler
-ADD
./apache-dolphinscheduler-incubating-${VERSION}-dolphinscheduler-bin.tar.gz
/opt/
-RUN ln -s
/opt/apache-dolphinscheduler-incubating-${VERSION}-dolphinscheduler-bin
/opt/dolphinscheduler
+ADD ./apache-dolphinscheduler-${VERSION}-dolphinscheduler-bin.tar.gz /opt/
+RUN ln -s /opt/apache-dolphinscheduler-${VERSION}-dolphinscheduler-bin
/opt/dolphinscheduler
ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler
# 3. add configuration and modify permissions and set soft links
diff --git a/docker/build/hooks/build b/docker/build/hooks/build
index a62a53a..3cac103 100755
--- a/docker/build/hooks/build
+++ b/docker/build/hooks/build
@@ -43,8 +43,8 @@ echo -e "mvn -B clean compile package -Prelease
-Dmaven.test.skip=true"
mvn -B clean compile package -Prelease -Dmaven.test.skip=true
# mv dolphinscheduler-bin.tar.gz file to docker/build directory
-echo -e "mv
$(pwd)/dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${VERSION}-dolphinscheduler-bin.tar.gz
$(pwd)/docker/build/\n"
-mv
$(pwd)/dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${VERSION}-dolphinscheduler-bin.tar.gz
$(pwd)/docker/build/
+echo -e "mv
$(pwd)/dolphinscheduler-dist/target/apache-dolphinscheduler-${VERSION}-dolphinscheduler-bin.tar.gz
$(pwd)/docker/build/\n"
+mv
$(pwd)/dolphinscheduler-dist/target/apache-dolphinscheduler-${VERSION}-dolphinscheduler-bin.tar.gz
$(pwd)/docker/build/
# docker build
BUILD_COMMAND="docker build --build-arg VERSION=${VERSION} -t
$DOCKER_REPO:${VERSION} $(pwd)/docker/build/"
diff --git a/docker/build/hooks/build.bat b/docker/build/hooks/build.bat
index e3a330f..77db088 100644
--- a/docker/build/hooks/build.bat
+++ b/docker/build/hooks/build.bat
@@ -44,8 +44,8 @@ call mvn clean compile package -Prelease -DskipTests=true
if "%errorlevel%"=="1" goto :mvnFailed
:: move dolphinscheduler-bin.tar.gz file to docker/build directory
-echo "move
%cd%\dolphinscheduler-dist\target\apache-dolphinscheduler-incubating-%VERSION%-SNAPSHOT-dolphinscheduler-bin.tar.gz
%cd%\docker\build\"
-move
%cd%\dolphinscheduler-dist\target\apache-dolphinscheduler-incubating-%VERSION%-dolphinscheduler-bin.tar.gz
%cd%\docker\build\
+echo "move
%cd%\dolphinscheduler-dist\target\apache-dolphinscheduler-%VERSION%-SNAPSHOT-dolphinscheduler-bin.tar.gz
%cd%\docker\build\"
+move
%cd%\dolphinscheduler-dist\target\apache-dolphinscheduler-%VERSION%-dolphinscheduler-bin.tar.gz
%cd%\docker\build\
:: docker build
echo "docker build --build-arg VERSION=%VERSION% -t %DOCKER_REPO%:%VERSION%
%cd%\docker\build\"
diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml
index 9d525d3..58deb43 100644
--- a/dolphinscheduler-dist/pom.xml
+++ b/dolphinscheduler-dist/pom.xml
@@ -202,9 +202,9 @@
</executions>
<configuration>
- <name>apache-dolphinscheduler-incubating</name>
+ <name>apache-dolphinscheduler</name>
<release>1</release>
- <distribution>apache dolphinscheduler incubating
rpm</distribution>
+ <distribution>apache dolphinscheduler
rpm</distribution>
<group>apache</group>
<packager>dolphinscheduler</packager>
<!-- <version>${project.version}</version> -->
@@ -420,10 +420,10 @@
<script>mkdir -p /opt/soft</script>
</preinstallScriptlet>
<postinstallScriptlet>
- <script>rm -rf /opt/soft/dolphinscheduler ; ln
-s /opt/soft/apache-dolphinscheduler-incubating-${project.version}
/opt/soft/dolphinscheduler</script>
+ <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-incubating-${project.version}</script>
+ <script>rm -rf
/opt/soft/apache-dolphinscheduler-${project.version}</script>
</postremoveScriptlet>
</configuration>
</plugin>
diff --git a/dolphinscheduler-dist/release-docs/NOTICE
b/dolphinscheduler-dist/release-docs/NOTICE
index ab11052..4cf082d 100644
--- a/dolphinscheduler-dist/release-docs/NOTICE
+++ b/dolphinscheduler-dist/release-docs/NOTICE
@@ -1,4 +1,4 @@
-Apache DolphinScheduler (incubating)
+Apache DolphinScheduler
Copyright 2019-2021 The Apache Software Foundation
This product includes software developed at
diff --git a/pom.xml b/pom.xml
index 0d995bd..923226a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -555,7 +555,7 @@
<build>
-
<finalName>apache-dolphinscheduler-incubating-${project.version}</finalName>
+ <finalName>apache-dolphinscheduler-${project.version}</finalName>
<pluginManagement>
<plugins>
