Browse Source

[Improvement] Remove incubating (#5305)

Shiwen Cheng 4 years ago
parent
commit
94a08c8f32

+ 2 - 2
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.

+ 2 - 2
README.md

@@ -73,8 +73,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

+ 2 - 2
README_zh_CN.md

@@ -76,8 +76,8 @@ DolphinScheduler的工作计划:<a href="https://github.com/apache/dolphinsche
 制品:
 
 ```
-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 源代码包
 ```
 
 ## 感谢

+ 2 - 2
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.

+ 1 - 1
ambari_plugin/common-services/DOLPHIN/1.3.0/metainfo.xml

@@ -103,7 +103,7 @@
                     <osFamily>any</osFamily>
                     <packages>
                         <package>
-                            <name>apache-dolphinscheduler-incubating*</name>
+                            <name>apache-dolphinscheduler*</name>
                         </package>
                     </packages>
                 </osSpecific>

+ 1 - 1
ambari_plugin/common-services/DOLPHIN/1.3.3/metainfo.xml

@@ -103,7 +103,7 @@
                     <osFamily>any</osFamily>
                     <packages>
                         <package>
-                            <name>apache-dolphinscheduler-incubating*</name>
+                            <name>apache-dolphinscheduler*</name>
                         </package>
                     </packages>
                 </osSpecific>

+ 2 - 2
docker/build/Dockerfile

@@ -34,8 +34,8 @@ RUN apk update && \
     rm -rf /var/cache/apk/*
 
 # 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

+ 2 - 2
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/"

+ 2 - 2
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\"

+ 4 - 4
dolphinscheduler-dist/pom.xml

@@ -196,9 +196,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> -->
@@ -415,10 +415,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>

+ 1 - 1
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

+ 1 - 1
pom.xml

@@ -624,7 +624,7 @@
 
     <build>
 
-        <finalName>apache-dolphinscheduler-incubating-${project.version}</finalName>
+        <finalName>apache-dolphinscheduler-${project.version}</finalName>
 
 
         <pluginManagement>