From 61aa73cc64f4c1f1c6e9b1b8ae28685ff98356f6 Mon Sep 17 00:00:00 2001
From: Jark Wu <jark@apache.org>
Date: Sat, 14 Dec 2024 21:17:14 +0800
Subject: [PATCH] [dist] Deploy fluss-dist package with start scripts and
 config files included

---
 fluss-dist/pom.xml                            | 52 ++-----------------
 fluss-dist/src/main/assemblies/bin.xml        |  6 +--
 .../{fluss-bin => resources}/bin/config.sh    |  0
 .../bin/coordinator-server.sh                 |  0
 .../bin/fluss-console.sh                      |  0
 .../bin/fluss-daemon.sh                       |  0
 .../{fluss-bin => resources}/bin/lakehouse.sh |  0
 .../bin/local-cluster.sh                      |  0
 .../bin/tablet-server.sh                      |  0
 .../conf/log4j-console.properties             |  0
 .../conf/log4j.properties                     |  2 +-
 .../conf/logback-console.xml                  |  0
 .../{fluss-bin => resources}/conf/logback.xml |  0
 .../conf/zookeeper.properties                 |  0
 14 files changed, 8 insertions(+), 52 deletions(-)
 rename fluss-dist/src/main/{fluss-bin => resources}/bin/config.sh (100%)
 rename fluss-dist/src/main/{fluss-bin => resources}/bin/coordinator-server.sh (100%)
 rename fluss-dist/src/main/{fluss-bin => resources}/bin/fluss-console.sh (100%)
 rename fluss-dist/src/main/{fluss-bin => resources}/bin/fluss-daemon.sh (100%)
 rename fluss-dist/src/main/{fluss-bin => resources}/bin/lakehouse.sh (100%)
 rename fluss-dist/src/main/{fluss-bin => resources}/bin/local-cluster.sh (100%)
 rename fluss-dist/src/main/{fluss-bin => resources}/bin/tablet-server.sh (100%)
 rename fluss-dist/src/main/{fluss-bin => resources}/conf/log4j-console.properties (100%)
 rename fluss-dist/src/main/{fluss-bin => resources}/conf/log4j.properties (98%)
 rename fluss-dist/src/main/{fluss-bin => resources}/conf/logback-console.xml (100%)
 rename fluss-dist/src/main/{fluss-bin => resources}/conf/logback.xml (100%)
 rename fluss-dist/src/main/{fluss-bin => resources}/conf/zookeeper.properties (100%)

diff --git a/fluss-dist/pom.xml b/fluss-dist/pom.xml
index 75e2cfaf4..31967419f 100644
--- a/fluss-dist/pom.xml
+++ b/fluss-dist/pom.xml
@@ -30,41 +30,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>com.alibaba.fluss</groupId>
-            <artifactId>fluss-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- start Fluss filesystem plugin -->
-        <dependency>
-            <groupId>com.alibaba.fluss</groupId>
-            <artifactId>fluss-fs-oss</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.fluss</groupId>
-            <artifactId>fluss-fs-s3</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.fluss</groupId>
-            <artifactId>fluss-lakehouse-paimon</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.fluss</groupId>
-            <artifactId>fluss-lakehouse-cli</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
         <!-- Concrete logging framework - we add this only here (and not in the
 			root POM) to not tie the projects to one specific framework and make
 			it easier for users to swap logging frameworks -->
@@ -196,10 +161,10 @@
                             <shadedArtifactAttached>false</shadedArtifactAttached>
                             <finalName>${project.artifactId}-${project.version}</finalName>
                             <artifactSet>
-                                <excludes>
-                                    <!-- log4j 2 is bundled separately from the fluss-server jar -->
-                                    <exclude>org.apache.logging.log4j:*</exclude>
-                                </excludes>
+                                <includes>
+                                    <!-- only include log4j-api to package source and javadoc to make sonatype happy -->
+                                    <include>org.apache.logging.log4j:log4j-api</include>
+                                </includes>
                             </artifactSet>
                         </configuration>
                     </execution>
@@ -247,15 +212,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.4</version><!--$NO-MVN-MAN-VER$-->
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/fluss-dist/src/main/assemblies/bin.xml b/fluss-dist/src/main/assemblies/bin.xml
index e74799e64..b3380b376 100644
--- a/fluss-dist/src/main/assemblies/bin.xml
+++ b/fluss-dist/src/main/assemblies/bin.xml
@@ -65,7 +65,7 @@
     <fileSets>
         <!-- copy start scripts -->
         <fileSet>
-            <directory>src/main/fluss-bin/bin</directory>
+            <directory>src/main/resources/bin</directory>
             <outputDirectory>bin</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
@@ -73,14 +73,14 @@
 
         <!-- copy default configuration -->
         <fileSet>
-            <directory>src/main/fluss-bin/conf</directory>
+            <directory>src/main/resources/conf</directory>
             <outputDirectory>conf</outputDirectory>
             <fileMode>0644</fileMode>
         </fileSet>
 
         <!-- create an empty log directory -->
         <fileSet>
-            <directory>src/main/fluss-bin/</directory>
+            <directory>src/main/resources/</directory>
             <outputDirectory>log</outputDirectory>
             <fileMode>0644</fileMode>
             <excludes>
diff --git a/fluss-dist/src/main/fluss-bin/bin/config.sh b/fluss-dist/src/main/resources/bin/config.sh
similarity index 100%
rename from fluss-dist/src/main/fluss-bin/bin/config.sh
rename to fluss-dist/src/main/resources/bin/config.sh
diff --git a/fluss-dist/src/main/fluss-bin/bin/coordinator-server.sh b/fluss-dist/src/main/resources/bin/coordinator-server.sh
similarity index 100%
rename from fluss-dist/src/main/fluss-bin/bin/coordinator-server.sh
rename to fluss-dist/src/main/resources/bin/coordinator-server.sh
diff --git a/fluss-dist/src/main/fluss-bin/bin/fluss-console.sh b/fluss-dist/src/main/resources/bin/fluss-console.sh
similarity index 100%
rename from fluss-dist/src/main/fluss-bin/bin/fluss-console.sh
rename to fluss-dist/src/main/resources/bin/fluss-console.sh
diff --git a/fluss-dist/src/main/fluss-bin/bin/fluss-daemon.sh b/fluss-dist/src/main/resources/bin/fluss-daemon.sh
similarity index 100%
rename from fluss-dist/src/main/fluss-bin/bin/fluss-daemon.sh
rename to fluss-dist/src/main/resources/bin/fluss-daemon.sh
diff --git a/fluss-dist/src/main/fluss-bin/bin/lakehouse.sh b/fluss-dist/src/main/resources/bin/lakehouse.sh
similarity index 100%
rename from fluss-dist/src/main/fluss-bin/bin/lakehouse.sh
rename to fluss-dist/src/main/resources/bin/lakehouse.sh
diff --git a/fluss-dist/src/main/fluss-bin/bin/local-cluster.sh b/fluss-dist/src/main/resources/bin/local-cluster.sh
similarity index 100%
rename from fluss-dist/src/main/fluss-bin/bin/local-cluster.sh
rename to fluss-dist/src/main/resources/bin/local-cluster.sh
diff --git a/fluss-dist/src/main/fluss-bin/bin/tablet-server.sh b/fluss-dist/src/main/resources/bin/tablet-server.sh
similarity index 100%
rename from fluss-dist/src/main/fluss-bin/bin/tablet-server.sh
rename to fluss-dist/src/main/resources/bin/tablet-server.sh
diff --git a/fluss-dist/src/main/fluss-bin/conf/log4j-console.properties b/fluss-dist/src/main/resources/conf/log4j-console.properties
similarity index 100%
rename from fluss-dist/src/main/fluss-bin/conf/log4j-console.properties
rename to fluss-dist/src/main/resources/conf/log4j-console.properties
diff --git a/fluss-dist/src/main/fluss-bin/conf/log4j.properties b/fluss-dist/src/main/resources/conf/log4j.properties
similarity index 98%
rename from fluss-dist/src/main/fluss-bin/conf/log4j.properties
rename to fluss-dist/src/main/resources/conf/log4j.properties
index 131302779..fe700e019 100644
--- a/fluss-dist/src/main/fluss-bin/conf/log4j.properties
+++ b/fluss-dist/src/main/resources/conf/log4j.properties
@@ -51,4 +51,4 @@ logger.netty.level=OFF
 logger.jindo_fsStats.name=com.aliyun.jindodata.common.FsStats
 logger.jindo_fsStats.level=OFF
 logger.jindo_jnative.name=com.aliyun.jindodata.jnative.NativeLogger
-logger.jindo_jnative.level=OFF
\ No newline at end of file
+logger.jindo_jnative.level=OFF
diff --git a/fluss-dist/src/main/fluss-bin/conf/logback-console.xml b/fluss-dist/src/main/resources/conf/logback-console.xml
similarity index 100%
rename from fluss-dist/src/main/fluss-bin/conf/logback-console.xml
rename to fluss-dist/src/main/resources/conf/logback-console.xml
diff --git a/fluss-dist/src/main/fluss-bin/conf/logback.xml b/fluss-dist/src/main/resources/conf/logback.xml
similarity index 100%
rename from fluss-dist/src/main/fluss-bin/conf/logback.xml
rename to fluss-dist/src/main/resources/conf/logback.xml
diff --git a/fluss-dist/src/main/fluss-bin/conf/zookeeper.properties b/fluss-dist/src/main/resources/conf/zookeeper.properties
similarity index 100%
rename from fluss-dist/src/main/fluss-bin/conf/zookeeper.properties
rename to fluss-dist/src/main/resources/conf/zookeeper.properties