You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ca...@apache.org on 2022/01/13 15:23:26 UTC

[dolphinscheduler] branch 2.0.3-prepare updated: Remove ambari plugin profile in 2.0.3 (#8011)

This is an automated email from the ASF dual-hosted git repository.

caishunfeng pushed a commit to branch 2.0.3-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/2.0.3-prepare by this push:
     new 600ee5e  Remove ambari plugin profile in 2.0.3 (#8011)
600ee5e is described below

commit 600ee5e77cfe618dfe489519fe27d43a04d5eebc
Author: Jiajie Zhong <zh...@hotmail.com>
AuthorDate: Thu Jan 13 23:23:17 2022 +0800

    Remove ambari plugin profile in 2.0.3 (#8011)
    
    We already total remove ambari in dev branch
    by #7880, and in version 2.0.2 just remove
    ambari plugin directory in #7749. This patch
    also remove related profiles of ambari plugin
---
 dolphinscheduler-dist/pom.xml | 270 ------------------------------------------
 dolphinscheduler-ui/pom.xml   |  55 ---------
 2 files changed, 325 deletions(-)

diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml
index 6905396..dc6f0cc 100644
--- a/dolphinscheduler-dist/pom.xml
+++ b/dolphinscheduler-dist/pom.xml
@@ -114,276 +114,6 @@
                 </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}/../dolphinscheduler-dao/src/main/resources/sql
-                                            </location>
-                                            <includes>
-                                                <include>**/*.*</include>
-                                            </includes>
-                                        </source>
-                                        <source>
-                                            <location>
-                                                ${basedir}/../dolphinscheduler-dao/src/main/resources/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>
 
     <build>
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 6aeafe1..6a6e7ff 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -89,61 +89,6 @@
       </build>
     </profile>
 
-    <profile>
-      <id>rpmbuild</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.github.eirslett</groupId>
-            <artifactId>frontend-maven-plugin</artifactId>
-            <version>${frontend-maven-plugin.version}</version>
-            <executions>
-              <execution>
-                <id>install node and npm</id>
-                <goals>
-                  <goal>install-node-and-npm</goal>
-                </goals>
-                <configuration>
-                  <nodeVersion>${node.version}</nodeVersion>
-                  <npmVersion>${npm.version}</npmVersion>
-                </configuration>
-              </execution>
-              <execution>
-                <id>npm install node-sass --unsafe-perm</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
-                <phase>generate-resources</phase>
-                <configuration>
-                  <arguments>install node-sass --unsafe-perm</arguments>
-                </configuration>
-              </execution>
-              <execution>
-                <id>npm install</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
-                <phase>generate-resources</phase>
-                <configuration>
-                  <arguments>install</arguments>
-                </configuration>
-              </execution>
-              <execution>
-                <id>npm run build:release</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
-                <configuration>
-                  <arguments>run build:release</arguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-
-      </build>
-    </profile>
-
   </profiles>
 
 </project>