You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2022/12/19 01:47:16 UTC

[incubator-streampark] branch dev updated: [Bug] maven assembly plugin param bug fixed (#2178)

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

benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev by this push:
     new 23be8e172 [Bug] maven assembly plugin param bug fixed (#2178)
23be8e172 is described below

commit 23be8e172adc50ff9dfa3804e77032ff4f6ec5d0
Author: benjobs <be...@apache.org>
AuthorDate: Mon Dec 19 09:47:11 2022 +0800

    [Bug] maven assembly plugin param bug fixed (#2178)
    
    * [Bug] maven assembly plugin param bug fixed
---
 .github/workflows/docker_push.yml                  |   6 +-
 .gitignore                                         |   1 -
 pom.xml                                            |  27 ---
 .../streampark-console-service/pom.xml             | 208 ++++++++++++++++++++-
 .../src/main/assembly/assembly.xml                 |  59 +++---
 .../src/main/assembly/bin/flame-graph/README.md    |   0
 .../src/main/assembly/bin/flame-graph/aix-perf.pl  |   0
 .../main/assembly/bin/flame-graph/difffolded.pl    |   0
 .../src/main/assembly/bin/flame-graph/files.pl     |   0
 .../main/assembly/bin/flame-graph/flamegraph.pl    |   0
 .../src/main/assembly/bin/flame-graph/jmaps        |   0
 .../main/assembly/bin/flame-graph/pkgsplit-perf.pl |   0
 .../main/assembly/bin/flame-graph/range-perf.pl    |   0
 .../main/assembly/bin/flame-graph/record-test.sh   |   0
 .../assembly/bin/flame-graph/stackcollapse-aix.pl  |   0
 .../bin/flame-graph/stackcollapse-bpftrace.pl      |   0
 .../bin/flame-graph/stackcollapse-elfutils.pl      |   0
 .../assembly/bin/flame-graph/stackcollapse-gdb.pl  |   0
 .../assembly/bin/flame-graph/stackcollapse-go.pl   |   0
 .../bin/flame-graph/stackcollapse-instruments.pl   |   0
 .../flame-graph/stackcollapse-java-exceptions.pl   |   0
 .../bin/flame-graph/stackcollapse-jstack.pl        |   0
 .../assembly/bin/flame-graph/stackcollapse-ljp.awk |   0
 .../bin/flame-graph/stackcollapse-perf-sched.awk   |   0
 .../assembly/bin/flame-graph/stackcollapse-perf.pl |   0
 .../assembly/bin/flame-graph/stackcollapse-pmc.pl  |   0
 .../bin/flame-graph/stackcollapse-recursive.pl     |   0
 .../bin/flame-graph/stackcollapse-sample.awk       |   0
 .../assembly/bin/flame-graph/stackcollapse-stap.pl |   0
 .../bin/flame-graph/stackcollapse-vsprof.pl        |   0
 .../bin/flame-graph/stackcollapse-vtune.pl         |   0
 .../bin/flame-graph/stackcollapse-xdebug.php       |   0
 .../main/assembly/bin/flame-graph/stackcollapse.pl |   0
 .../main/assembly/bin/flame-graph/stackcollapse.py |   0
 .../src/main/assembly/bin/mvnw                     |   0
 .../src/main/assembly/bin/mvnw.cmd                 |   0
 .../src/main/assembly/bin/setclasspath.sh          |   0
 .../src/main/assembly/bin/shutdown.sh              |   0
 .../src/main/assembly/bin/startup.sh               |   0
 .../src/main/assembly/bin/streampark.sh            |   0
 .../src/main/assembly/client/.gitkeep              |   0
 .../src/main/assembly/conf/.gitkeep                |   0
 .../src/main/assembly/logs/.gitkeep                |   0
 .../src/main/assembly/plugins/Dockerfile           |   0
 .../src/main/assembly/script/README.md             |   0
 .../src/main/assembly/script/data/mysql-data.sql   |   0
 .../src/main/assembly/script/data/pgsql-data.sql   |   0
 .../main/assembly/script/schema/mysql-schema.sql   |   0
 .../main/assembly/script/schema/pgsql-schema.sql   |   0
 .../main/assembly/script/upgrade/mysql/1.2.3.sql   |   0
 .../main/assembly/script/upgrade/mysql/2.0.0.sql   |   0
 .../src/main/assembly/temp/.gitkeep                |   0
 streampark-dist/pom.xml                            | 141 --------------
 53 files changed, 229 insertions(+), 213 deletions(-)

diff --git a/.github/workflows/docker_push.yml b/.github/workflows/docker_push.yml
index b2e5fbb8d..c7d2a86d8 100644
--- a/.github/workflows/docker_push.yml
+++ b/.github/workflows/docker_push.yml
@@ -55,9 +55,9 @@ jobs:
 
       - name: init
         run: |
-          sed -i -e 's/eval $NOHUP/eval/' streampark-dist/src/main/assembly/bin/streampark.sh
-          sed -i -e 's/StreamParkConsoleBootstrap \\/StreamParkConsoleBootstrap/' streampark-dist/src/main/assembly/bin/streampark.sh
-          sed -i -e 's/>> "$APP_OUT" 2>&1 "&"//' streampark-dist/src/main/assembly/bin/streampark.sh
+          sed -i -e 's/eval $NOHUP/eval/' streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
+          sed -i -e 's/StreamParkConsoleBootstrap \\/StreamParkConsoleBootstrap/' streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
+          sed -i -e 's/>> "$APP_OUT" 2>&1 "&"//' streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
 
       - name: Build project release package
         run: |
diff --git a/.gitignore b/.gitignore
index 8d1c07adc..918c3a234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@
 out/
 target/
 *.log*
-bin/
 tmp/
 *.iml
 *.tmp
diff --git a/pom.xml b/pom.xml
index de69a5166..a4694f42d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,6 @@
         <scala-maven-plugin.version>4.7.1</scala-maven-plugin.version>
         <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
         <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
-        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
         <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
         <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
@@ -900,16 +899,6 @@
                     </executions>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>${maven-release-plugin.version}</version>
-                    <configuration>
-                        <tagNameFormat>@{project.version}</tagNameFormat>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                    </configuration>
-                </plugin>
-
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -975,13 +964,6 @@
     </build>
 
     <profiles>
-
-        <profile>
-            <id>dist</id>
-            <modules>
-                <module>streampark-dist</module>
-            </modules>
-        </profile>
         <!--
         include streampark-console(streaming application operation platform) modules
         -->
@@ -1030,28 +1012,19 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-deploy-plugin</artifactId>
-                        <inherited>true</inherited>
                     </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
                     </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                     </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
                     </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-release-plugin</artifactId>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
diff --git a/streampark-console/streampark-console-service/pom.xml b/streampark-console/streampark-console-service/pom.xml
index e678ffc73..1ae2aca8d 100644
--- a/streampark-console/streampark-console-service/pom.xml
+++ b/streampark-console/streampark-console-service/pom.xml
@@ -472,6 +472,209 @@
             </build>
         </profile>
 
+        <profile>
+            <id>scala-2.12</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>3.0.2</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <excludeTransitive>false</excludeTransitive>
+                            <stripVersion>false</stripVersion>
+                            <artifactItems>
+                                <!-- flink 1.12 support-->
+                                <dependency>
+                                    <groupId>org.apache.streampark</groupId>
+                                    <artifactId>streampark-flink-shims_flink-1.12_${scala.binary.version}</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/shims</outputDirectory>
+                                </dependency>
+                                <!-- flink 1.13 support-->
+                                <dependency>
+                                    <groupId>org.apache.streampark</groupId>
+                                    <artifactId>streampark-flink-shims_flink-1.13_${scala.binary.version}</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/shims</outputDirectory>
+                                </dependency>
+                                <!-- flink 1.14 support-->
+                                <dependency>
+                                    <groupId>org.apache.streampark</groupId>
+                                    <artifactId>streampark-flink-shims_flink-1.14_${scala.binary.version}</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/shims</outputDirectory>
+                                </dependency>
+                                <!-- flink 1.15 support-->
+                                <dependency>
+                                    <groupId>org.apache.streampark</groupId>
+                                    <artifactId>streampark-flink-shims_flink-1.15_${scala.binary.version}</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/shims</outputDirectory>
+                                </dependency>
+                                <!-- flink 1.16 support-->
+                                <dependency>
+                                    <groupId>org.apache.streampark</groupId>
+                                    <artifactId>streampark-flink-shims_flink-1.16_${scala.binary.version}</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/shims</outputDirectory>
+                                </dependency>
+                                <!-- flink-submit-core -->
+                                <dependency>
+                                    <groupId>org.apache.streampark</groupId>
+                                    <artifactId>streampark-flink-submit-core_${scala.binary.version}</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                </dependency>
+                            </artifactItems>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>3.1.1</version>
+                        <executions>
+                            <execution>
+                                <id>dist</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <appendAssemblyId>false</appendAssemblyId>
+                                    <skipAssembly>false</skipAssembly>
+                                    <attach>false</attach>
+                                    <finalName>apache-streampark_${scala.binary.version}-${project.version}-incubating-bin</finalName>
+                                    <descriptors>
+                                        <descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>scala-2.11</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>3.0.2</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <excludeTransitive>false</excludeTransitive>
+                            <stripVersion>false</stripVersion>
+                            <artifactItems>
+                                <!-- flink 1.12 support-->
+                                <dependency>
+                                    <groupId>org.apache.streampark</groupId>
+                                    <artifactId>streampark-flink-shims_flink-1.12_${scala.binary.version}</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/shims</outputDirectory>
+                                </dependency>
+                                <!-- flink 1.13 support-->
+                                <dependency>
+                                    <groupId>org.apache.streampark</groupId>
+                                    <artifactId>streampark-flink-shims_flink-1.13_${scala.binary.version}</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/shims</outputDirectory>
+                                </dependency>
+                                <!-- flink 1.14 support-->
+                                <dependency>
+                                    <groupId>org.apache.streampark</groupId>
+                                    <artifactId>streampark-flink-shims_flink-1.14_${scala.binary.version}</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/shims</outputDirectory>
+                                </dependency>
+                                <!-- flink-submit-core -->
+                                <dependency>
+                                    <groupId>org.apache.streampark</groupId>
+                                    <artifactId>streampark-flink-submit-core_${scala.binary.version}</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                </dependency>
+                            </artifactItems>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>3.1.1</version>
+                        <executions>
+                            <execution>
+                                <id>dist</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <appendAssemblyId>false</appendAssemblyId>
+                                    <skipAssembly>false</skipAssembly>
+                                    <attach>false</attach>
+                                    <finalName>apache-streampark_${scala.binary.version}-${project.version}-incubating-bin</finalName>
+                                    <descriptors>
+                                        <descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>dist</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>dist</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <copy
+                                            file="${project.build.directory}/apache-streampark_${scala.binary.version}-${project.version}-incubating-bin.tar.gz"
+                                            tofile="${project.basedir}/../../dist/apache-streampark_${scala.binary.version}-${project.version}-incubating-bin.tar.gz"
+                                            overwrite="true" />
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
     </profiles>
 
     <build>
@@ -511,11 +714,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-            </plugin>
-
         </plugins>
     </build>
 
diff --git a/streampark-dist/src/main/assembly/assembly.xml b/streampark-console/streampark-console-service/src/main/assembly/assembly.xml
similarity index 81%
rename from streampark-dist/src/main/assembly/assembly.xml
rename to streampark-console/streampark-console-service/src/main/assembly/assembly.xml
index a569edbd9..a1edd4a35 100644
--- a/streampark-dist/src/main/assembly/assembly.xml
+++ b/streampark-console/streampark-console-service/src/main/assembly/assembly.xml
@@ -49,84 +49,71 @@
     </dependencySets>
 
     <fileSets>
-
         <fileSet>
-            <directory>${basedir}/../streampark-console/streampark-console-service/src/main/resources</directory>
-            <outputDirectory>conf</outputDirectory>
+            <directory>${project.build.directory}/../../../.mvn</directory>
+            <outputDirectory>bin/.mvn</outputDirectory>
             <fileMode>0755</fileMode>
-            <includes>
-                <include>*.yml</include>
-                <include>*.properties</include>
-                <include>logback*.xml</include>
-            </includes>
         </fileSet>
-
         <fileSet>
-            <directory>${basedir}/../streampark-console/streampark-console-service/target/lib</directory>
-            <outputDirectory>lib</outputDirectory>
+            <directory>${project.build.directory}/../src/main/assembly/bin</directory>
+            <outputDirectory>bin</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
-
         <fileSet>
             <directory>${project.build.directory}/lib</directory>
             <outputDirectory>lib</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
-
         <fileSet>
-            <directory>${basedir}/../.mvn</directory>
-            <outputDirectory>bin/.mvn</outputDirectory>
-            <fileMode>0755</fileMode>
-        </fileSet>
-
-        <fileSet>
-            <directory>${basedir}/src/main/assembly/bin</directory>
-            <outputDirectory>bin</outputDirectory>
+            <directory>${project.build.directory}/shims</directory>
+            <outputDirectory>lib</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
-
         <fileSet>
-            <directory>${basedir}/src/main/assembly/logs</directory>
+            <directory>${project.build.directory}/../src/main/assembly/logs</directory>
             <outputDirectory>logs</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
-
         <fileSet>
-            <directory>${basedir}/src/main/assembly/temp</directory>
+            <directory>${project.build.directory}/../src/main/assembly/temp</directory>
             <outputDirectory>temp</outputDirectory>
             <fileMode>0777</fileMode>
         </fileSet>
-
         <fileSet>
-            <directory>${basedir}/src/main/assembly/client</directory>
+            <directory>${project.build.directory}/../src/main/assembly/client</directory>
             <outputDirectory>client</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
-
         <fileSet>
-            <directory>${basedir}/src/main/assembly/plugins</directory>
+            <directory>${project.build.directory}/../src/main/assembly/plugins</directory>
             <outputDirectory>plugins</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
-
         <fileSet>
-            <directory>${basedir}/src/main/assembly/script</directory>
+            <directory>${project.build.directory}/../src/main/assembly/script</directory>
             <outputDirectory>script</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
-
         <fileSet>
-            <directory>${project.basedir}/../</directory>
+            <directory>${project.build.directory}/../src/main/resources</directory>
+            <outputDirectory>conf</outputDirectory>
+            <fileMode>0755</fileMode>
+            <includes>
+                <include>*.yml</include>
+                <include>*.properties</include>
+                <include>logback*.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/../../../</directory>
             <outputDirectory/>
             <includes>
                 <include>README.md</include>
             </includes>
         </fileSet>
-
         <fileSet>
-            <directory>${project.basedir}/../dist-material/release-docs</directory>
+            <directory>${project.build.directory}/../../../dist-material/release-docs</directory>
             <outputDirectory/>
         </fileSet>
-
     </fileSets>
 </assembly>
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/README.md b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/README.md
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/README.md
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/README.md
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/aix-perf.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/aix-perf.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/aix-perf.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/aix-perf.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/difffolded.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/difffolded.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/difffolded.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/difffolded.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/files.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/files.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/files.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/files.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/flamegraph.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/flamegraph.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/flamegraph.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/flamegraph.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/jmaps b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/jmaps
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/jmaps
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/jmaps
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/pkgsplit-perf.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/pkgsplit-perf.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/pkgsplit-perf.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/pkgsplit-perf.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/range-perf.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/range-perf.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/range-perf.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/range-perf.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/record-test.sh b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/record-test.sh
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/record-test.sh
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/record-test.sh
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-aix.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-aix.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-aix.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-aix.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-bpftrace.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-bpftrace.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-bpftrace.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-bpftrace.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-elfutils.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-elfutils.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-elfutils.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-elfutils.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-gdb.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-gdb.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-gdb.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-gdb.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-go.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-go.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-go.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-go.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-instruments.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-instruments.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-instruments.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-instruments.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-java-exceptions.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-java-exceptions.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-java-exceptions.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-java-exceptions.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-jstack.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-jstack.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-jstack.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-jstack.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-ljp.awk b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-ljp.awk
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-ljp.awk
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-ljp.awk
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-perf-sched.awk b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-perf-sched.awk
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-perf-sched.awk
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-perf-sched.awk
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-perf.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-perf.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-perf.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-perf.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-pmc.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-pmc.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-pmc.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-pmc.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-recursive.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-recursive.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-recursive.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-recursive.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-sample.awk b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-sample.awk
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-sample.awk
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-sample.awk
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-stap.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-stap.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-stap.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-stap.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-vsprof.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-vsprof.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-vsprof.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-vsprof.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-vtune.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-vtune.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-vtune.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-vtune.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-xdebug.php b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-xdebug.php
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse-xdebug.php
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse-xdebug.php
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse.pl b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse.pl
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse.pl
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse.pl
diff --git a/streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse.py b/streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse.py
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/flame-graph/stackcollapse.py
rename to streampark-console/streampark-console-service/src/main/assembly/bin/flame-graph/stackcollapse.py
diff --git a/streampark-dist/src/main/assembly/bin/mvnw b/streampark-console/streampark-console-service/src/main/assembly/bin/mvnw
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/mvnw
rename to streampark-console/streampark-console-service/src/main/assembly/bin/mvnw
diff --git a/streampark-dist/src/main/assembly/bin/mvnw.cmd b/streampark-console/streampark-console-service/src/main/assembly/bin/mvnw.cmd
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/mvnw.cmd
rename to streampark-console/streampark-console-service/src/main/assembly/bin/mvnw.cmd
diff --git a/streampark-dist/src/main/assembly/bin/setclasspath.sh b/streampark-console/streampark-console-service/src/main/assembly/bin/setclasspath.sh
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/setclasspath.sh
rename to streampark-console/streampark-console-service/src/main/assembly/bin/setclasspath.sh
diff --git a/streampark-dist/src/main/assembly/bin/shutdown.sh b/streampark-console/streampark-console-service/src/main/assembly/bin/shutdown.sh
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/shutdown.sh
rename to streampark-console/streampark-console-service/src/main/assembly/bin/shutdown.sh
diff --git a/streampark-dist/src/main/assembly/bin/startup.sh b/streampark-console/streampark-console-service/src/main/assembly/bin/startup.sh
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/startup.sh
rename to streampark-console/streampark-console-service/src/main/assembly/bin/startup.sh
diff --git a/streampark-dist/src/main/assembly/bin/streampark.sh b/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
similarity index 100%
rename from streampark-dist/src/main/assembly/bin/streampark.sh
rename to streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
diff --git a/streampark-dist/src/main/assembly/client/.gitkeep b/streampark-console/streampark-console-service/src/main/assembly/client/.gitkeep
similarity index 100%
rename from streampark-dist/src/main/assembly/client/.gitkeep
rename to streampark-console/streampark-console-service/src/main/assembly/client/.gitkeep
diff --git a/streampark-dist/src/main/assembly/conf/.gitkeep b/streampark-console/streampark-console-service/src/main/assembly/conf/.gitkeep
similarity index 100%
rename from streampark-dist/src/main/assembly/conf/.gitkeep
rename to streampark-console/streampark-console-service/src/main/assembly/conf/.gitkeep
diff --git a/streampark-dist/src/main/assembly/logs/.gitkeep b/streampark-console/streampark-console-service/src/main/assembly/logs/.gitkeep
similarity index 100%
rename from streampark-dist/src/main/assembly/logs/.gitkeep
rename to streampark-console/streampark-console-service/src/main/assembly/logs/.gitkeep
diff --git a/streampark-dist/src/main/assembly/plugins/Dockerfile b/streampark-console/streampark-console-service/src/main/assembly/plugins/Dockerfile
similarity index 100%
rename from streampark-dist/src/main/assembly/plugins/Dockerfile
rename to streampark-console/streampark-console-service/src/main/assembly/plugins/Dockerfile
diff --git a/streampark-dist/src/main/assembly/script/README.md b/streampark-console/streampark-console-service/src/main/assembly/script/README.md
similarity index 100%
rename from streampark-dist/src/main/assembly/script/README.md
rename to streampark-console/streampark-console-service/src/main/assembly/script/README.md
diff --git a/streampark-dist/src/main/assembly/script/data/mysql-data.sql b/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
similarity index 100%
rename from streampark-dist/src/main/assembly/script/data/mysql-data.sql
rename to streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
diff --git a/streampark-dist/src/main/assembly/script/data/pgsql-data.sql b/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
similarity index 100%
rename from streampark-dist/src/main/assembly/script/data/pgsql-data.sql
rename to streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
diff --git a/streampark-dist/src/main/assembly/script/schema/mysql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
similarity index 100%
rename from streampark-dist/src/main/assembly/script/schema/mysql-schema.sql
rename to streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
diff --git a/streampark-dist/src/main/assembly/script/schema/pgsql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
similarity index 100%
rename from streampark-dist/src/main/assembly/script/schema/pgsql-schema.sql
rename to streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
diff --git a/streampark-dist/src/main/assembly/script/upgrade/mysql/1.2.3.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/1.2.3.sql
similarity index 100%
rename from streampark-dist/src/main/assembly/script/upgrade/mysql/1.2.3.sql
rename to streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/1.2.3.sql
diff --git a/streampark-dist/src/main/assembly/script/upgrade/mysql/2.0.0.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.0.0.sql
similarity index 100%
rename from streampark-dist/src/main/assembly/script/upgrade/mysql/2.0.0.sql
rename to streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.0.0.sql
diff --git a/streampark-dist/src/main/assembly/temp/.gitkeep b/streampark-console/streampark-console-service/src/main/assembly/temp/.gitkeep
similarity index 100%
rename from streampark-dist/src/main/assembly/temp/.gitkeep
rename to streampark-console/streampark-console-service/src/main/assembly/temp/.gitkeep
diff --git a/streampark-dist/pom.xml b/streampark-dist/pom.xml
deleted file mode 100644
index f7a0a5abd..000000000
--- a/streampark-dist/pom.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.streampark</groupId>
-        <artifactId>streampark</artifactId>
-        <version>2.0.0</version>
-    </parent>
-
-    <artifactId>streampark-dist</artifactId>
-    <packaging>pom</packaging>
-    <name>StreamPark : dist</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.streampark</groupId>
-            <artifactId>streampark-console-service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- flink submit core -->
-        <dependency>
-            <groupId>org.apache.streampark</groupId>
-            <artifactId>streampark-flink-submit-core_${scala.binary.version}</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- flink 1.12 support-->
-        <dependency>
-            <groupId>org.apache.streampark</groupId>
-            <artifactId>streampark-flink-shims_flink-1.12_${scala.binary.version}</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- flink 1.13 support-->
-        <dependency>
-            <groupId>org.apache.streampark</groupId>
-            <artifactId>streampark-flink-shims_flink-1.13_${scala.binary.version}</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- flink 1.14 support-->
-        <dependency>
-            <groupId>org.apache.streampark</groupId>
-            <artifactId>streampark-flink-shims_flink-1.14_${scala.binary.version}</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>scala-2.12</id>
-            <dependencies>
-                <!-- flink 1.15 support-->
-                <dependency>
-                    <groupId>org.apache.streampark</groupId>
-                    <artifactId>streampark-flink-shims_flink-1.15_${scala.binary.version}</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-                <!-- flink 1.16 support-->
-                <dependency>
-                    <groupId>org.apache.streampark</groupId>
-                    <artifactId>streampark-flink-shims_flink-1.16_${scala.binary.version}</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-            </dependencies>
-        </profile>
-
-    </profiles>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <id>dist</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <skipAssembly>false</skipAssembly>
-                            <attach>false</attach>
-                            <finalName>apache-streampark_${scala.binary.version}-${project.version}-incubating-bin</finalName>
-                            <descriptors>
-                                <descriptor>src/main/assembly/assembly.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>dist</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <copy
-                                    file="${project.build.directory}/apache-streampark_${scala.binary.version}-${project.version}-incubating-bin.tar.gz"
-                                    tofile="${project.basedir}/../dist/apache-streampark_${scala.binary.version}-${project.version}-incubating-bin.tar.gz"
-                                    overwrite="true" />
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>