This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch add_canvas_job_define
in repository https://gitbox.apache.org/repos/asf/seatunnel-web.git
The following commit(s) were added to refs/heads/add_canvas_job_define by this
push:
new f4217f8a improve the logging framework (#61)
f4217f8a is described below
commit f4217f8af2e105c68d7ea5c532285436f53afd7a
Author: Eric <[email protected]>
AuthorDate: Tue Jun 20 16:23:32 2023 +0800
improve the logging framework (#61)
---
README.md | 16 +-
build.sh | 2 +-
pom.xml | 307 ++++++++++++---------
seatunnel-server/seatunnel-app/pom.xml | 25 +-
.../src/main/resources/application.yml | 4 +-
seatunnel-ui/src/views/virtual-tables/detail.tsx | 8 +-
seatunnel-web-dist/pom.xml | 4 +-
.../src/main/assembly/seatunnel-web-ci.xml | 12 +-
.../src/main/assembly/seatunnel-web.xml | 12 +-
9 files changed, 212 insertions(+), 178 deletions(-)
diff --git a/README.md b/README.md
index 4800fcff..6353d46d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Apache SeaTunnel (Incubating)
+# Apache SeaTunnel
<img src="https://seatunnel.apache.org/image/logo.png"; alt="seatunnel logo"
height="200px" align="right" />
@@ -106,19 +106,19 @@ cd incubator-seatunnel-web
sh build.sh code
```
-Then you can find the installer package in dir
`incubator-seatunnel-web/seatunnel-web-dist/target/apache-seatunnel-web-incubating-${project.version}.tar.gz`.
+Then you can find the installer package in dir
`incubator-seatunnel-web/seatunnel-web-dist/target/apache-seatunnel-web-${project.version}.tar.gz`.
#### 3.2 Install
-Copy the `apache-seatunnel-web-incubating-${project.version}.tar.gz` to your
server node and unzip it.
+Copy the `apache-seatunnel-web-${project.version}.tar.gz` to your server node
and unzip it.
```shell
-tar -zxvf apache-seatunnel-web-incubating-${project.version}.tar.gz
+tar -zxvf apache-seatunnel-web-${project.version}.tar.gz
```
#### 3.3 Init database
-1. Edit
`apache-seatunnel-web-incubating-${project.version}/script/seatunnel_server_env.sh`
file, Complete the installed database address, port, username, and password.
Here is an example:
+1. Edit
`apache-seatunnel-web-${project.version}/script/seatunnel_server_env.sh` file,
Complete the installed database address, port, username, and password. Here is
an example:
```
export HOSTNAME="localhost"
@@ -126,18 +126,18 @@ tar -zxvf
apache-seatunnel-web-incubating-${project.version}.tar.gz
export USERNAME="root"
export PASSWORD="123456"
```
-2. Run init shell `sh
apache-seatunnel-web-incubating-${project.version}/script/init_sql.sh` If there
are no errors during operation, it indicates successful initialization.
+2. Run init shell `sh
apache-seatunnel-web-${project.version}/script/init_sql.sh` If there are no
errors during operation, it indicates successful initialization.
#### 3.4 Config application and Run SeaTunnel Web Backend Server
-Edit
`apache-seatunnel-web-incubating-${project.version}/config/application.yml`
Fill in the database connection information and DS interface related
information in the file.
+Edit `apache-seatunnel-web-${project.version}/config/application.yml` Fill in
the database connection information and DS interface related information in the
file.
#### 3.5 Start SeaTunnel Web
```shell
-cd apache-seatunnel-web-incubating-${project.version}
+cd apache-seatunnel-web-${project.version}
sh bin/seatunnel-backend-daemon.sh start
```
diff --git a/build.sh b/build.sh
index 9a849703..da4f8b1d 100644
--- a/build.sh
+++ b/build.sh
@@ -29,7 +29,7 @@ DOCKER_VERSION=1.0.0-snapshot
code() {
/bin/sh $WORKDIR/mvnw clean package -DskipTests
# mv release zip
- mv
$WORKDIR/seatunnel-web-dist/target/apache-seatunnel-web-incubating-1.0.0-SNAPSHOT.zip
$WORKDIR/
+ mv
$WORKDIR/seatunnel-web-dist/target/apache-seatunnel-web-1.0.0-SNAPSHOT.zip
$WORKDIR/
}
# build image
diff --git a/pom.xml b/pom.xml
index 1ee1df59..ae977907 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,11 +59,8 @@
<maven-scm-provider-jgit.version>1.9.5</maven-scm-provider-jgit.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
<maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
- <lombok.version>1.18.0</lombok.version>
<skipUT>false</skipUT>
<!-- dependency -->
- <commons.logging.version>1.2</commons.logging.version>
- <slf4j.version>1.7.25</slf4j.version>
<jackson-databind.version>2.12.7.1</jackson-databind.version>
<jackson.version>2.12.7</jackson.version>
<mysql.version>8.0.16</mysql.version>
@@ -73,7 +70,6 @@
<commons-lang3.version>3.12.0</commons-lang3.version>
<guava.version>19.0</guava.version>
<checker.qual.version>3.10.0</checker.qual.version>
- <log4j-core.version>2.17.1</log4j-core.version>
<awaitility.version>4.2.0</awaitility.version>
<seatunnel-framework.version>2.3.1</seatunnel-framework.version>
<redshift.version>2.1.0.9</redshift.version>
@@ -103,37 +99,158 @@
<hadoop-aws.version>3.1.4</hadoop-aws.version>
<aws-java-sdk-bundle.version>1.11.271</aws-java-sdk-bundle.version>
<spotless.version>2.29.0</spotless.version>
+ <logback.version>1.2.11</logback.version>
+ <log4j2.version>2.17.1</log4j2.version>
+ <logback.version>1.2.3</logback.version>
+ <commons-logging.version>1.2</commons-logging.version>
+ <log4j.version>1.2.17</log4j.version>
+ <log4j-core.version>2.17.1</log4j-core.version>
+ <slf4j.version>1.7.25</slf4j.version>
</properties>
<dependencyManagement>
<dependencies>
+ <!-- ***************** slf4j & provider & bridges start
***************** -->
+ <!-- Declare slf4j-api -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <!-- Declare slf4j-api provider: logback -->
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+
+ <!-- Include the logging bridges -->
+ <!-- commons-logging bridge to slf4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <!-- jdk-logging bridge to slf4j -->
+ <!-- low performance, see:
https://www.slf4j.org/legacy.html#jul-to-slf4j
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ -->
+
+ <!-- Exclude the logging bridges via provided scope -->
+ <!-- log4j1.x bridge to slf4j
+ Use of the SLF4J adapter (log4j-over-slf4j) together with the
SLF4J bridge (slf4j-log4j12) should never be attempted as it will cause events
to endlessly be routed between SLF4J and Log4j 1
+ -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <!-- slf4j binding to log4j1.x -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- log4j2.x binding to slf4j.
+ Use of the SLF4J adapter (log4j-to-slf4j-2.x.jar) together
with the SLF4J bridge (log4j-slf4j-impl-2.x.jar) should never be attempted as
it will cause events to endlessly be routed between SLF4J and Log4j 2
+ -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <!-- slf4j binding to jdk-logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- slf4j binding to commons-logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- slf4j binding to nop -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- slf4j binding to simple -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- slf4j binding to reload4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Exclude other logging provider via provided scope -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- ***************** slf4j & provider & bridges end
***************** -->
+
<!-- seatunnel main repository dependency -->
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-common</artifactId>
<version>${seatunnel-framework.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -146,30 +263,6 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-properties</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -177,28 +270,6 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-api</artifactId>
<version>${seatunnel-framework.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -218,28 +289,6 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-plugin-discovery</artifactId>
<version>${seatunnel-framework.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -387,13 +436,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -429,23 +471,6 @@
<version>${guava.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
@@ -524,12 +549,6 @@
<artifactId>jsr305</artifactId>
<version>${jsr305.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-engine-client</artifactId>
- <version>${seatunnel-framework.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -542,7 +561,40 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ </dependency>
+
+ <!-- Declare slf4j-api provider: logback -->
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </dependency>
+
+ <!-- Include the logging bridges -->
+ <!-- commons-logging bridge to slf4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <!-- log4j2.x binding to slf4j.
+ Use of the SLF4J adapter (log4j-to-slf4j-2.x.jar) together with
the SLF4J bridge (log4j-slf4j-impl-2.x.jar) should never be attempted as it
will cause events to endlessly be routed between SLF4J and Log4j 2
+ -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -822,6 +874,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
+ <version>3.0.1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>@{project.version}</tagNameFormat>
@@ -840,10 +893,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/seatunnel-server/seatunnel-app/pom.xml
b/seatunnel-server/seatunnel-app/pom.xml
index d6aa95be..2e6e0ef2 100644
--- a/seatunnel-server/seatunnel-app/pom.xml
+++ b/seatunnel-server/seatunnel-app/pom.xml
@@ -42,11 +42,7 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-plugin-discovery</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-scheduler-dolphinscheduler</artifactId>
- <version>${project.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-server-common</artifactId>
@@ -65,13 +61,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.seatunnel</groupId>
- <artifactId>datasource-s3</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!--springboot-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -197,12 +186,6 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-scheduler-dolphinscheduler</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -238,12 +221,6 @@
<groupId>com.cronutils</groupId>
<artifactId>cron-utils</artifactId>
</dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service-annotations</artifactId>
diff --git a/seatunnel-server/seatunnel-app/src/main/resources/application.yml
b/seatunnel-server/seatunnel-app/src/main/resources/application.yml
index bf297a4a..e35d8d13 100644
--- a/seatunnel-server/seatunnel-app/src/main/resources/application.yml
+++ b/seatunnel-server/seatunnel-app/src/main/resources/application.yml
@@ -27,7 +27,7 @@ spring:
driver-class-name: com.mysql.jdbc.Driver
url:
jdbc:mysql://localhost:3306/seatunnel?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&allowPublicKeyRetrieval=true
username: root
- password: 123456
+ password: root@123
mvc:
pathmatch:
matching-strategy: ant_path_matcher
@@ -39,7 +39,7 @@ ds:
tenant:
default: gaojun
api:
- token: fcec21193f5e00189aad3fef7bc50c6e
+ token: 6781b46bba1039c622d602beb25e880e
prefix: http://localhost:12345/dolphinscheduler
jwt:
diff --git a/seatunnel-ui/src/views/virtual-tables/detail.tsx
b/seatunnel-ui/src/views/virtual-tables/detail.tsx
index 7434d8dc..294f0fd2 100644
--- a/seatunnel-ui/src/views/virtual-tables/detail.tsx
+++ b/seatunnel-ui/src/views/virtual-tables/detail.tsx
@@ -27,10 +27,10 @@ import {
NCard,
useDialog
} from 'naive-ui'
-import StepOneForm from './StepOneForm'
-import StepTwoForm from './StepTwoForm'
-import StepTwoTable from './StepTwoTable'
-import StepThreeParams from './StepThreeParams'
+import StepOneForm from './step-one-form'
+import StepTwoForm from './step-two-form'
+import StepTwoTable from './step-two-table'
+import StepThreeParams from './step-three-params'
import { PlusOutlined } from '@vicons/antd'
import { useRoute, useRouter } from 'vue-router'
import { useI18n } from 'vue-i18n'
diff --git a/seatunnel-web-dist/pom.xml b/seatunnel-web-dist/pom.xml
index 7fbcac6a..3637e786 100644
--- a/seatunnel-web-dist/pom.xml
+++ b/seatunnel-web-dist/pom.xml
@@ -104,7 +104,7 @@
</dependencies>
<build>
-
<finalName>apache-seatunnel-web-incubating-${project.version}</finalName>
+ <finalName>apache-seatunnel-web-${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -361,7 +361,7 @@
</dependencies>
<build>
-
<finalName>apache-seatunnel-web-incubating-${project.version}</finalName>
+ <finalName>apache-seatunnel-web-${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/seatunnel-web-dist/src/main/assembly/seatunnel-web-ci.xml
b/seatunnel-web-dist/src/main/assembly/seatunnel-web-ci.xml
index 2260084f..fc041ea7 100644
--- a/seatunnel-web-dist/src/main/assembly/seatunnel-web-ci.xml
+++ b/seatunnel-web-dist/src/main/assembly/seatunnel-web-ci.xml
@@ -24,7 +24,7 @@
<format>zip</format>
<format>tar.gz</format>
</formats>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>../seatunnel-server/seatunnel-app/src/main/resources</directory>
@@ -81,6 +81,7 @@
</includes>
<excludes>
<exclude>org.apache.seatunnel:datasource-*:jar</exclude>
+ <exclude>org.apache.logging.log4j:*:jar</exclude>
</excludes>
<outputDirectory>/libs</outputDirectory>
<scope>provided</scope>
@@ -95,6 +96,7 @@
</includes>
<excludes>
<exclude>org.apache.seatunnel:datasource-*:jar</exclude>
+ <exclude>org.apache.logging.log4j:*:jar</exclude>
</excludes>
<outputDirectory>/libs</outputDirectory>
</dependencySet>
@@ -107,10 +109,12 @@
<outputDirectory>/libs</outputDirectory>
<includes>
<include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:jcl-over-slf4j:jar</include>
+ <include>org.apache.logging.log4j:log4j-to-slf4j:jar</include>
<include>org.apache.logging.log4j:log4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-core:jar</include>
-
<include>org.apache.logging.log4j:log4j-slf4j-impl:jar</include>
+ <include>org.slf4j:jcl-over-slf4j:jar</include>
+ <include>org.slf4j:log4j-over-slf4j:jar</include>
+ <include>ch.qos.logback:logback-classic:jar</include>
+ <include>ch.qos.logback:logback-core:jar</include>
</includes>
</dependencySet>
diff --git a/seatunnel-web-dist/src/main/assembly/seatunnel-web.xml
b/seatunnel-web-dist/src/main/assembly/seatunnel-web.xml
index 4a726e68..3cb18a95 100644
--- a/seatunnel-web-dist/src/main/assembly/seatunnel-web.xml
+++ b/seatunnel-web-dist/src/main/assembly/seatunnel-web.xml
@@ -24,7 +24,7 @@
<format>zip</format>
<format>tar.gz</format>
</formats>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>../seatunnel-server/seatunnel-app/src/main/resources</directory>
@@ -81,6 +81,7 @@
</includes>
<excludes>
<exclude>org.apache.seatunnel:datasource-*:jar</exclude>
+ <exclude>org.apache.logging.log4j:*:jar</exclude>
</excludes>
<outputDirectory>/libs</outputDirectory>
<scope>provided</scope>
@@ -95,6 +96,7 @@
</includes>
<excludes>
<exclude>org.apache.seatunnel:datasource-*:jar</exclude>
+ <exclude>org.apache.logging.log4j:*:jar</exclude>
</excludes>
<outputDirectory>/libs</outputDirectory>
</dependencySet>
@@ -107,10 +109,12 @@
<outputDirectory>/libs</outputDirectory>
<includes>
<include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:jcl-over-slf4j:jar</include>
+ <include>org.apache.logging.log4j:log4j-to-slf4j:jar</include>
<include>org.apache.logging.log4j:log4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-core:jar</include>
-
<include>org.apache.logging.log4j:log4j-slf4j-impl:jar</include>
+ <include>org.slf4j:jcl-over-slf4j:jar</include>
+ <include>org.slf4j:log4j-over-slf4j:jar</include>
+ <include>ch.qos.logback:logback-classic:jar</include>
+ <include>ch.qos.logback:logback-core:jar</include>
</includes>
</dependencySet>
</dependencySets>
![https://seatunnel.apache.org/image/logo.png"](https://seatunnel.apache.org/image/logo.png"){kind=link}