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 @@ - - com.alibaba.fluss - fluss-server - ${project.version} - - - - - com.alibaba.fluss - fluss-fs-oss - ${project.version} - provided - - - - com.alibaba.fluss - fluss-fs-s3 - ${project.version} - provided - - - - com.alibaba.fluss - fluss-lakehouse-paimon - ${project.version} - provided - - - - com.alibaba.fluss - fluss-lakehouse-cli - ${project.version} - provided - - @@ -196,10 +161,10 @@ false ${project.artifactId}-${project.version} - - - org.apache.logging.log4j:* - + + + org.apache.logging.log4j:log4j-api + @@ -247,15 +212,6 @@ - - - org.apache.maven.plugins - maven-deploy-plugin - 2.4 - - true - - 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 @@ - src/main/fluss-bin/bin + src/main/resources/bin bin 0755 @@ -73,14 +73,14 @@ - src/main/fluss-bin/conf + src/main/resources/conf conf 0644 - src/main/fluss-bin/ + src/main/resources/ log 0644 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