Skip to content

Commit

Permalink
[Improvement][Seatunnel-web] Bump seatunnel version from 2.3.7 to 2.3…
Browse files Browse the repository at this point in the history 
….8 (#226)
  • Loading branch information
@arshadmohammad
arshadmohammad authored Oct 14, 2024
1 parent ee399d2 commit b50b8e7
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 40 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<guava.version>33.2.1-jre</guava.version>
<checker.qual.version>3.10.0</checker.qual.version>
<awaitility.version>4.2.0</awaitility.version>
<seatunnel-framework.version>2.3.7</seatunnel-framework.version>
<seatunnel-framework.version>2.3.8</seatunnel-framework.version>
<oracle-jdbc.version>21.5.0.0</oracle-jdbc.version>
<postgresql.version>42.4.3</postgresql.version>
<sqlserver.version>9.2.1.jre8</sqlserver.version>
Expand Down
2 changes: 1 addition & 1 deletion .../seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/EngineServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class EngineServiceImpl extends SeatunnelBaseServiceImpl implements IEngi
Lists.newArrayList(
// new Engine("Spark", "2.4.0"),
// new Engine("Flink", "1.13.6"),
new Engine(EngineType.SeaTunnel, "2.3.7")));
new Engine(EngineType.SeaTunnel, "2.3.8")));

@Override
public List<Engine> listSupportEngines() {
Expand Down
2 changes: 1 addition & 1 deletion ...nel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobDefinitionServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public long createJob(int userId, JobReq jobReq)
.name(DEFAULT_VERSION)
.id(uuid)
.engineName(EngineType.SeaTunnel)
.engineVersion("2.3.7");
.engineVersion("2.3.8");
if (BusinessMode.DATA_INTEGRATION.equals(jobReq.getJobType())) {
builder.jobMode(JobMode.BATCH);
} else if (BusinessMode.DATA_REPLICA.equals(jobReq.getJobType())) {
Expand Down
30 changes: 15 additions & 15 deletions seatunnel-web-dist/release-docs/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,21 +226,21 @@ The text of each license is the standard Apache 2.0 license.
(Apache License, Version 2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.20 - https://mvnrepository.com/artifact/org.apache.commons/commons-compress/1.20)
(Apache License, Version 2.0) config (com.typesafe:config:1.3.3 - https://github.com/lightbend/config)
(The Apache Software License, Version 2.0) hazelcast (com.hazelcast:hazelcast:5.1 - https://github.com/hazelcast/hazelcast)
(Apache License, Version 2.0) SeaTunnel Common (org.apache.seatunnel:seatunnel-common:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-common)
(Apache License, Version 2.0) SeaTunnel API (org.apache.seatunnel:seatunnel-api:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-api)
(Apache License, Version 2.0) SeaTunnel Config Base (org.apache.seatunnel:seatunnel-config-base:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-config-base)
(Apache License, Version 2.0) SeaTunnel Config Shade (org.apache.seatunnel:seatunnel-config-shade:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-config-shade)
(Apache License, Version 2.0) SeaTunnel Core Starter (org.apache.seatunnel:seatunnel-core-starter:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-core-starter)
(Apache License, Version 2.0) SeaTunnel Core Starter (org.apache.seatunnel:seatunnel-core-starter:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-core-starter)
(Apache License, Version 2.0) SeaTunnel Engine Client (org.apache.seatunnel:seatunnel-engine-client:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-engine-client)
(Apache License, Version 2.0) SeaTunnel Engine Common (org.apache.seatunnel:seatunnel-engine-common:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-engine-common)
(Apache License, Version 2.0) SeaTunnel Engine Core (org.apache.seatunnel:seatunnel-engine-core:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-engine-core)
(Apache License, Version 2.0) SeaTunnel Guava (org.apache.seatunnel:seatunnel-guava:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-guava)
(Apache License, Version 2.0) SeaTunnel Jackson (org.apache.seatunnel:seatunnel-jackson:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-jackson)
(Apache License, Version 2.0) SeaTunnel Plugin Discovery (org.apache.seatunnel:seatunnel-plugin-discovery:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-plugin-discovery)
(Apache License, Version 2.0) SeaTunnel Transform V2 (org.apache.seatunnel:seatunnel-transforms-v2:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-transforms-v2)
(Apache License, Version 2.0) SeaTunnel Serializer Api (org.apache.seatunnel:serializer-api:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/serializer-api)
(Apache License, Version 2.0) SeaTunnel Serializer Protobuf (org.apache.seatunnel:serializer-protobuf:2.3.7 - https://mvnrepository.com/artifact/org.apache.seatunnel/serializer-protobuf)
(Apache License, Version 2.0) SeaTunnel Common (org.apache.seatunnel:seatunnel-common:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-common)
(Apache License, Version 2.0) SeaTunnel API (org.apache.seatunnel:seatunnel-api:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-api)
(Apache License, Version 2.0) SeaTunnel Config Base (org.apache.seatunnel:seatunnel-config-base:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-config-base)
(Apache License, Version 2.0) SeaTunnel Config Shade (org.apache.seatunnel:seatunnel-config-shade:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-config-shade)
(Apache License, Version 2.0) SeaTunnel Core Starter (org.apache.seatunnel:seatunnel-core-starter:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-core-starter)
(Apache License, Version 2.0) SeaTunnel Core Starter (org.apache.seatunnel:seatunnel-core-starter:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-core-starter)
(Apache License, Version 2.0) SeaTunnel Engine Client (org.apache.seatunnel:seatunnel-engine-client:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-engine-client)
(Apache License, Version 2.0) SeaTunnel Engine Common (org.apache.seatunnel:seatunnel-engine-common:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-engine-common)
(Apache License, Version 2.0) SeaTunnel Engine Core (org.apache.seatunnel:seatunnel-engine-core:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-engine-core)
(Apache License, Version 2.0) SeaTunnel Guava (org.apache.seatunnel:seatunnel-guava:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-guava)
(Apache License, Version 2.0) SeaTunnel Jackson (org.apache.seatunnel:seatunnel-jackson:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-jackson)
(Apache License, Version 2.0) SeaTunnel Plugin Discovery (org.apache.seatunnel:seatunnel-plugin-discovery:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-plugin-discovery)
(Apache License, Version 2.0) SeaTunnel Transform V2 (org.apache.seatunnel:seatunnel-transforms-v2:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/seatunnel-transforms-v2)
(Apache License, Version 2.0) SeaTunnel Serializer Api (org.apache.seatunnel:serializer-api:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/serializer-api)
(Apache License, Version 2.0) SeaTunnel Serializer Protobuf (org.apache.seatunnel:serializer-protobuf:2.3.8 - https://mvnrepository.com/artifact/org.apache.seatunnel/serializer-protobuf)

(The Apache Software License, Version 2.0) Guava: Google Core Libraries for Java (com.google.guava:guava:19.0 - https://github.com/google/guava)
(Apache License 2.0) Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:6.2.2.Final - http://hibernate.org/validator/hibernate-validator)
Expand Down
6 changes: 3 additions & 3 deletions seatunnel-web-it/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ Build seatunnel-web
./mvnw clean install -DskipTests

Run seatunnel-web-it integration tests
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false -DSEATUNNEL_HOME=/some/path/apache-seatunnel-2.3.7 -DST_WEB_BASEDIR_PATH=seatunnel-web-dist/target/apache-seatunnel-web-1.0.2-SNAPSHOT/apache-seatunnel-web-1.0.2-SNAPSHOT
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false -DSEATUNNEL_HOME=/some/path/apache-seatunnel-2.3.8 -DST_WEB_BASEDIR_PATH=seatunnel-web-dist/target/apache-seatunnel-web-1.0.2-SNAPSHOT/apache-seatunnel-web-1.0.2-SNAPSHOT
NOTE: Please remember to update the versions according to the latest supported versions.

If you're using a version of Java higher than Java 8 for running the tests, add the following VM options:
-DitJvmArgs="-Xmx1024m --add-opens java.base/java.lang.invoke=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED"

While running integrations tests from IDE, ensure following VM options are set
SEATUNNEL_HOME=/some/path/apache-seatunnel-2.3.7
SEATUNNEL_HOME=/some/path/apache-seatunnel-2.3.8
ST_WEB_BASEDIR_PATH=/some/path/seatunnel-web-dist/target/apache-seatunnel-web-1.0.2-SNAPSHOT/apache-seatunnel-web-1.0.2-SNAPSHOT

By default, integration tests use the H2 database. If you want to use the MySQL database, update the MySQL database details in src/test/resources/application.yml and run the seatunnel-web-it integration tests with the -DdbType=mysql option as shown below:
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false -DdbType=mysql -DSEATUNNEL_HOME=/some/path/apache-seatunnel-2.3.7 -DST_WEB_BASEDIR_PATH=seatunnel-web-dist/target/apache-seatunnel-web-1.0.2-SNAPSHOT/apache-seatunnel-web-1.0.2-SNAPSHOT
./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false -DdbType=mysql -DSEATUNNEL_HOME=/some/path/apache-seatunnel-2.3.8 -DST_WEB_BASEDIR_PATH=seatunnel-web-dist/target/apache-seatunnel-web-1.0.2-SNAPSHOT/apache-seatunnel-web-1.0.2-SNAPSHOT
3 changes: 2 additions & 1 deletion tools/dependencies/checkLicense.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ echo '=== Third party dependencies: ' && grep -vf self-modules.txt all-dependenc
# command in target OS is different from what we used to sort the file `known-dependencies.txt`, i.e. "sort the two file
# using the same command (and default arguments)"

diff -w -B -U0 <(sort < tools/dependencies/known-dependencies.txt) <(sort < third-party-dependencies.txt)
sort tools/dependencies/known-dependencies.txt > /tmp/sorted-known-dependencies.txt
diff -w -B -U0 /tmp/sorted-known-dependencies.txt third-party-dependencies.txt
43 changes: 25 additions & 18 deletions tools/dependencies/known-dependencies.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ tomcat-embed-el-9.0.63.jar
h2-2.1.214.jar
auto-service-annotations-1.0.1.jar
jsr305-3.0.0.jar
checkpoint-storage-api-2.3.7.jar
checkpoint-storage-local-file-2.3.7.jar
checkpoint-storage-api-2.3.8.jar
checkpoint-storage-local-file-2.3.8.jar
clickhouse-cli-client-0.3.2-patch11-shaded.jar
clickhouse-grpc-client-0.3.2-patch11-shaded.jar
clickhouse-http-client-0.3.2-patch11-shaded.jar
Expand All @@ -112,22 +112,22 @@ protostuff-api-1.8.0.jar
protostuff-collectionschema-1.8.0.jar
protostuff-core-1.8.0.jar
protostuff-runtime-1.8.0.jar
seatunnel-api-2.3.7.jar
seatunnel-common-2.3.7.jar
seatunnel-config-base-2.3.7.jar
seatunnel-config-shade-2.3.7.jar
seatunnel-core-starter-2.3.7.jar
seatunnel-engine-client-2.3.7.jar
seatunnel-engine-common-2.3.7.jar
seatunnel-engine-core-2.3.7.jar
seatunnel-guava-2.3.7-optional.jar
seatunnel-jackson-2.3.7-optional.jar
seatunnel-plugin-discovery-2.3.7.jar
seatunnel-transforms-v2-2.3.7.jar
seatunnel-config-sql-2.3.7.jar
seatunnel-hazelcast-shade-2.3.7-optional.jar
serializer-api-2.3.7.jar
serializer-protobuf-2.3.7.jar
seatunnel-api-2.3.8.jar
seatunnel-common-2.3.8.jar
seatunnel-config-base-2.3.8.jar
seatunnel-config-shade-2.3.8.jar
seatunnel-core-starter-2.3.8.jar
seatunnel-engine-client-2.3.8.jar
seatunnel-engine-common-2.3.8.jar
seatunnel-engine-core-2.3.8.jar
seatunnel-guava-2.3.8-optional.jar
seatunnel-jackson-2.3.8-optional.jar
seatunnel-plugin-discovery-2.3.8.jar
seatunnel-transforms-v2-2.3.8.jar
seatunnel-config-sql-2.3.8.jar
seatunnel-hazelcast-shade-2.3.8-optional.jar
serializer-api-2.3.8.jar
serializer-protobuf-2.3.8.jar
swagger-annotations-2.2.14.jar
commons-codec-1.11.jar
commons-compress-1.20.jar
Expand All @@ -141,6 +141,13 @@ security-206.jar
snappy-java-1.1.8.4.jar
zstd-jni-1.5.2-1.jar
commons-csv-1.10.0.jar
simpleclient-0.16.0.jar
simpleclient_common-0.16.0.jar
simpleclient_hotspot-0.16.0.jar
simpleclient_httpserver-0.16.0.jar
simpleclient_tracer_common-0.16.0.jar
simpleclient_tracer_otel-0.16.0.jar
simpleclient_tracer_otel_agent-0.16.0.jar



Expand Down

0 comments on commit b50b8e7

Please sign in to comment.