diff --git a/README.md b/README.md
index 4800fcff7..6353d46df 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Apache SeaTunnel (Incubating)
+# Apache SeaTunnel
@@ -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.
![image](docs/images/application_config.png)
#### 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 9a8497036..da4f8b1df 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 1ee1df595..ae977907b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,11 +59,8 @@
1.9.5
3.1.0
3.3.0
- 1.18.0
false
- 1.2
- 1.7.25
2.12.7.1
2.12.7
8.0.16
@@ -73,7 +70,6 @@
3.12.0
19.0
3.10.0
- 2.17.1
4.2.0
2.3.1
2.1.0.9
@@ -103,37 +99,158 @@
3.1.4
1.11.271
2.29.0
+ 1.2.11
+ 2.17.1
+ 1.2.3
+ 1.2
+ 1.2.17
+ 2.17.1
+ 1.7.25
+
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback.version}
+
+
+
+
+
+ org.slf4j
+ jcl-over-slf4j
+ ${slf4j.version}
+
+
+
+
+
+
+
+ org.slf4j
+ log4j-over-slf4j
+ ${slf4j.version}
+
+
+
+ org.slf4j
+ slf4j-log4j12
+ ${slf4j.version}
+ provided
+
+
+
+ org.apache.logging.log4j
+ log4j-to-slf4j
+ ${log4j2.version}
+
+
+
+ org.slf4j
+ slf4j-jdk14
+ ${slf4j.version}
+ provided
+
+
+
+ org.slf4j
+ slf4j-jcl
+ ${slf4j.version}
+ provided
+
+
+
+ org.slf4j
+ slf4j-nop
+ ${slf4j.version}
+ provided
+
+
+
+ org.slf4j
+ slf4j-simple
+ ${slf4j.version}
+ provided
+
+
+
+ org.slf4j
+ slf4j-reload4j
+ ${slf4j.version}
+ provided
+
+
+
+ commons-logging
+ commons-logging
+ ${commons-logging.version}
+ provided
+
+
+ log4j
+ log4j
+ ${log4j.version}
+ provided
+
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ ${log4j2.version}
+ provided
+
+
+ org.apache.logging.log4j
+ log4j-api
+ ${log4j2.version}
+
+
+ org.apache.logging.log4j
+ log4j-core
+ ${log4j2.version}
+ provided
+
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
+ ${log4j2.version}
+ provided
+
+
+
+
org.apache.seatunnel
seatunnel-common
${seatunnel-framework.version}
-
-
- org.slf4j
- jcl-over-slf4j
-
-
- org.apache.logging.log4j
- log4j-1.2-api
-
-
- org.apache.logging.log4j
- log4j-api
-
-
- org.apache.logging.log4j
- log4j-core
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
-
-
@@ -146,30 +263,6 @@
com.fasterxml.jackson.dataformat
jackson-dataformat-properties
-
- org.slf4j
- slf4j-log4j12
-
-
- org.apache.logging.log4j
- log4j-1.2-api
-
-
- org.slf4j
- jcl-over-slf4j
-
-
- org.apache.logging.log4j
- log4j-api
-
-
- org.apache.logging.log4j
- log4j-core
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
-
@@ -177,28 +270,6 @@
org.apache.seatunnel
seatunnel-api
${seatunnel-framework.version}
-
-
- org.slf4j
- jcl-over-slf4j
-
-
- org.apache.logging.log4j
- log4j-1.2-api
-
-
- org.apache.logging.log4j
- log4j-api
-
-
- org.apache.logging.log4j
- log4j-core
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
-
-
@@ -218,28 +289,6 @@
org.apache.seatunnel
seatunnel-plugin-discovery
${seatunnel-framework.version}
-
-
- org.slf4j
- jcl-over-slf4j
-
-
- org.apache.logging.log4j
- log4j-1.2-api
-
-
- org.apache.logging.log4j
- log4j-api
-
-
- org.apache.logging.log4j
- log4j-core
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
-
-
@@ -387,13 +436,6 @@
test
-
- org.projectlombok
- lombok
- ${lombok.version}
- provided
-
-
org.apache.commons
commons-lang3
@@ -429,23 +471,6 @@
${guava.version}
-
- org.apache.logging.log4j
- log4j-core
- ${log4j-core.version}
-
-
- org.slf4j
- slf4j-api
- ${slf4j.version}
-
-
-
- org.slf4j
- slf4j-log4j12
- ${slf4j.version}
-
-
org.checkerframework
checker-qual
@@ -524,12 +549,6 @@
jsr305
${jsr305.version}
-
-
- org.apache.seatunnel
- seatunnel-engine-client
- ${seatunnel-framework.version}
-
@@ -542,7 +561,40 @@
org.slf4j
slf4j-api
- ${slf4j.version}
+
+
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ ch.qos.logback
+ logback-core
+
+
+
+ org.apache.logging.log4j
+ log4j-api
+
+
+
+ org.slf4j
+ log4j-over-slf4j
+
+
+
+
+
+ org.slf4j
+ jcl-over-slf4j
+
+
+
+ org.apache.logging.log4j
+ log4j-to-slf4j
org.junit.jupiter
@@ -822,6 +874,7 @@
org.apache.maven.plugins
maven-release-plugin
+ 3.0.1
true
@{project.version}
@@ -840,10 +893,6 @@
org.apache.maven.plugins
maven-surefire-plugin
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
org.apache.maven.plugins
diff --git a/seatunnel-server/seatunnel-app/pom.xml b/seatunnel-server/seatunnel-app/pom.xml
index d6aa95be2..2e6e0ef2a 100644
--- a/seatunnel-server/seatunnel-app/pom.xml
+++ b/seatunnel-server/seatunnel-app/pom.xml
@@ -42,11 +42,7 @@
org.apache.seatunnel
seatunnel-plugin-discovery
-
- org.apache.seatunnel
- seatunnel-scheduler-dolphinscheduler
- ${project.version}
-
+
org.apache.seatunnel
seatunnel-server-common
@@ -65,13 +61,6 @@
${project.version}
-
- org.apache.seatunnel
- datasource-s3
- ${project.version}
- provided
-
-
org.springframework.boot
@@ -197,12 +186,6 @@
org.apache.seatunnel
seatunnel-scheduler-dolphinscheduler
${project.version}
-
-
- org.slf4j
- slf4j-log4j12
-
-
@@ -238,12 +221,6 @@
com.cronutils
cron-utils
-
-
- commons-io
- commons-io
-
-
com.google.auto.service
auto-service-annotations
diff --git a/seatunnel-server/seatunnel-app/src/main/resources/application.yml b/seatunnel-server/seatunnel-app/src/main/resources/application.yml
index bf297a4a2..e35d8d132 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 7434d8dcf..294f0fd23 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 7fbcac6aa..3637e7860 100644
--- a/seatunnel-web-dist/pom.xml
+++ b/seatunnel-web-dist/pom.xml
@@ -104,7 +104,7 @@
- apache-seatunnel-web-incubating-${project.version}
+ apache-seatunnel-web-${project.version}
maven-assembly-plugin
@@ -361,7 +361,7 @@
- apache-seatunnel-web-incubating-${project.version}
+ apache-seatunnel-web-${project.version}
maven-assembly-plugin
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 2260084f2..fc041ea76 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 @@
zip
tar.gz
- false
+ true
../seatunnel-server/seatunnel-app/src/main/resources
@@ -81,6 +81,7 @@
org.apache.seatunnel:datasource-*:jar
+ org.apache.logging.log4j:*:jar
/libs
provided
@@ -95,6 +96,7 @@
org.apache.seatunnel:datasource-*:jar
+ org.apache.logging.log4j:*:jar
/libs
@@ -107,10 +109,12 @@
/libs
org.slf4j:slf4j-api:jar
- org.slf4j:jcl-over-slf4j:jar
+ org.apache.logging.log4j:log4j-to-slf4j:jar
org.apache.logging.log4j:log4j-api:jar
- org.apache.logging.log4j:log4j-core:jar
- org.apache.logging.log4j:log4j-slf4j-impl:jar
+ org.slf4j:jcl-over-slf4j:jar
+ org.slf4j:log4j-over-slf4j:jar
+ ch.qos.logback:logback-classic:jar
+ ch.qos.logback:logback-core:jar
diff --git a/seatunnel-web-dist/src/main/assembly/seatunnel-web.xml b/seatunnel-web-dist/src/main/assembly/seatunnel-web.xml
index 4a726e681..3cb18a959 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 @@
zip
tar.gz
- false
+ true
../seatunnel-server/seatunnel-app/src/main/resources
@@ -81,6 +81,7 @@
org.apache.seatunnel:datasource-*:jar
+ org.apache.logging.log4j:*:jar
/libs
provided
@@ -95,6 +96,7 @@
org.apache.seatunnel:datasource-*:jar
+ org.apache.logging.log4j:*:jar
/libs
@@ -107,10 +109,12 @@
/libs
org.slf4j:slf4j-api:jar
- org.slf4j:jcl-over-slf4j:jar
+ org.apache.logging.log4j:log4j-to-slf4j:jar
org.apache.logging.log4j:log4j-api:jar
- org.apache.logging.log4j:log4j-core:jar
- org.apache.logging.log4j:log4j-slf4j-impl:jar
+ org.slf4j:jcl-over-slf4j:jar
+ org.slf4j:log4j-over-slf4j:jar
+ ch.qos.logback:logback-classic:jar
+ ch.qos.logback:logback-core:jar