This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel-web.git
The following commit(s) were added to refs/heads/main by this push:
new 5ec38881 Fix the time field value returned by the user management list
query interface to be null (#22)
5ec38881 is described below
commit 5ec38881c4eac471ef21247320a5e6e9d19c2017
Author: Kerwin <[email protected]>
AuthorDate: Thu Feb 9 11:04:56 2023 +0800
Fix the time field value returned by the user management list query
interface to be null (#22)
* Fix the time field value returned by the user management list query
interface to be null.
* add dependency license
* add dependency license
---
seatunnel-server/pom.xml | 23 ++++++++++++++----
seatunnel-server/seatunnel-app/pom.xml | 28 ++++++----------------
.../src/main/resources/application.yml | 2 ++
seatunnel-web-dist/release-docs/binary/LICENSE | 16 ++++++++-----
tools/dependencies/known-dependencies.txt | 16 ++++++++-----
5 files changed, 48 insertions(+), 37 deletions(-)
diff --git a/seatunnel-server/pom.xml b/seatunnel-server/pom.xml
index 572a165c..6e3b7022 100644
--- a/seatunnel-server/pom.xml
+++ b/seatunnel-server/pom.xml
@@ -35,7 +35,7 @@
<properties>
<spring-boot.version>2.6.8</spring-boot.version>
<spring.version>5.3.20</spring.version>
-
<mybatis-spring-boot-starter.version>2.2.2</mybatis-spring-boot-starter.version>
+
<mybatis-plus-boot-starter.version>3.5.3.1</mybatis-plus-boot-starter.version>
<druid-spring-boot-starter.version>1.2.9</druid-spring-boot-starter.version>
<springfox-swagger.version>2.6.1</springfox-swagger.version>
<swagger-annotations.version>1.5.10</swagger-annotations.version>
@@ -63,6 +63,11 @@
<artifactId>spring-boot-starter-aop</artifactId>
<version>${spring-boot.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jdbc</artifactId>
+ <version>${spring-boot.version}</version>
+ </dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
@@ -71,9 +76,19 @@
<!-- ORM -->
<dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${mybatis-spring-boot-starter.version}</version>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>${mybatis-plus-boot-starter.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spring-boot-autoconfigure</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
diff --git a/seatunnel-server/seatunnel-app/pom.xml
b/seatunnel-server/seatunnel-app/pom.xml
index 15bff4ba..3a5acfe6 100644
--- a/seatunnel-server/seatunnel-app/pom.xml
+++ b/seatunnel-server/seatunnel-app/pom.xml
@@ -62,27 +62,13 @@
</dependency>
<dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${mybatis-spring-boot-starter.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>spring-beans</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-boot-autoconfigure</artifactId>
- <groupId>org.springframework.boot</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-core</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-boot-starter</artifactId>
- <groupId>org.springframework.boot</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jdbc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<dependency>
diff --git a/seatunnel-server/seatunnel-app/src/main/resources/application.yml
b/seatunnel-server/seatunnel-app/src/main/resources/application.yml
index 6453f587..414b36d1 100644
--- a/seatunnel-server/seatunnel-app/src/main/resources/application.yml
+++ b/seatunnel-server/seatunnel-app/src/main/resources/application.yml
@@ -18,6 +18,8 @@
spring:
application:
name: seatunnel
+ jackson:
+ date-format: yyyy-MM-dd HH:mm:ss
datasource:
driver-class-name: com.mysql.jdbc.Driver
url:
jdbc:mysql://127.0.0.1:3306/seatunnel?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
diff --git a/seatunnel-web-dist/release-docs/binary/LICENSE
b/seatunnel-web-dist/release-docs/binary/LICENSE
index 8c486a7a..ece66a18 100644
--- a/seatunnel-web-dist/release-docs/binary/LICENSE
+++ b/seatunnel-web-dist/release-docs/binary/LICENSE
@@ -249,10 +249,14 @@ The text of each license is the standard Apache 2.0
license.
(Apache License, Version 2.0) JJWT :: Extensions :: Jackson
(io.jsonwebtoken:jjwt-jackson:0.10.7 -
https://github.com/jwtk/jjwt/jjwt-jackson)
(The Apache Software License, Version 2.0) Apache Log4j
(log4j:log4j:1.2.17 - http://logging.apache.org/log4j/1.2/)
(The Apache Software License, Version 2.0) MapStruct Core
(org.mapstruct:mapstruct:1.0.0.Final - http://mapstruct.org/mapstruct/)
- (The Apache Software License, Version 2.0) mybatis
(org.mybatis:mybatis:3.5.9 - http://www.mybatis.org/mybatis-3)
+ (The Apache Software License, Version 2.0) mybatis
(org.mybatis:mybatis:3.5.10 - http://www.mybatis.org/mybatis-3)
(The Apache Software License, Version 2.0) mybatis-spring
(org.mybatis:mybatis-spring:2.0.7 - http://www.mybatis.org/spring/)
- (The Apache Software License, Version 2.0)
mybatis-spring-boot-autoconfigure
(org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2 -
http://www.mybatis.org/spring-boot-starter/mybatis-spring-boot-autoconfigure/)
- (The Apache Software License, Version 2.0) mybatis-spring-boot-starter
(org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2 -
http://www.mybatis.org/spring-boot-starter/mybatis-spring-boot-starter/)
+ (The Apache Software License, Version 2.0) mybatis-plus
(com.baomidou:mybatis-plus:3.5.3.1 - https://github.com/baomidou/mybatis-plus/)
+ (The Apache Software License, Version 2.0) mybatis-plus-annotation
(com.baomidou:mybatis-plus-annotation:3.5.3.1 -
https://github.com/baomidou/mybatis-plus/)
+ (The Apache Software License, Version 2.0) mybatis-plus-boot-starter
(com.baomidou:mybatis-plus-boot-starter:3.5.3.1 -
https://github.com/baomidou/mybatis-plus/)
+ (The Apache Software License, Version 2.0) mybatis-plus-core
(com.baomidou:mybatis-plus-core:3.5.3.1 -
https://github.com/baomidou/mybatis-plus/)
+ (The Apache Software License, Version 2.0) mybatis-plus-extension
(com.baomidou:mybatis-plus-extension:3.5.3.1 -
https://github.com/baomidou/mybatis-plus/)
+ (The Apache Software License, Version 2.0 And GNU Library or Lesser
General Public License (LGPL) V2.1) jsqlparser
(com.github.jsqlparser:jsqlparser:4.4 -
https://github.com/JSQLParser/JSqlParser/)
(Apache License, Version 2.0) SnakeYAML (org.yaml:snakeyaml:1.29 -
http://www.snakeyaml.org)
(Apache License, Version 2.0) Spring AOP
(org.springframework:spring-aop:5.3.20 -
https://github.com/spring-projects/spring-framework)
(Apache License, Version 2.0) Spring Beans
(org.springframework:spring-beans:5.3.20 -
https://github.com/spring-projects/spring-framework)
@@ -260,7 +264,7 @@ The text of each license is the standard Apache 2.0 license.
(Apache License, Version 2.0) spring-boot-autoconfigure
(org.springframework.boot:spring-boot-autoconfigure:2.6.8 -
https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter
(org.springframework.boot:spring-boot-starter:2.6.8 -
https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-aop
(org.springframework.boot:spring-boot-starter-aop:2.6.8 -
https://spring.io/projects/spring-boot)
- (Apache License, Version 2.0) spring-boot-starter-jdbc
(org.springframework.boot:spring-boot-starter-jdbc:2.6.3 -
https://spring.io/projects/spring-boot)
+ (Apache License, Version 2.0) spring-boot-starter-jdbc
(org.springframework.boot:spring-boot-starter-jdbc:2.6.8 -
https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-jetty
(org.springframework.boot:spring-boot-starter-jetty:2.6.8 -
https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-json
(org.springframework.boot:spring-boot-starter-json:2.6.8 -
https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-logging
(org.springframework.boot:spring-boot-starter-logging:2.6.8 -
https://spring.io/projects/spring-boot)
@@ -269,10 +273,10 @@ The text of each license is the standard Apache 2.0
license.
(Apache License, Version 2.0) Spring Core
(org.springframework:spring-core:5.3.20 -
https://github.com/spring-projects/spring-framework)
(Apache License, Version 2.0) Spring Expression Language (SpEL)
(org.springframework:spring-expression:5.3.20 -
https://github.com/spring-projects/spring-framework)
(Apache License, Version 2.0) Spring Commons Logging Bridge
(org.springframework:spring-jcl:5.3.20 -
https://github.com/spring-projects/spring-framework)
- (Apache License, Version 2.0) Spring JDBC
(org.springframework:spring-jdbc:5.3.15 -
https://github.com/spring-projects/spring-framework)
+ (Apache License, Version 2.0) Spring JDBC
(org.springframework:spring-jdbc:5.3.20 -
https://github.com/spring-projects/spring-framework)
(Apache License, Version 2.0) Spring Plugin - Core
(org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE -
https://github.com/spring-projects/spring-plugin/spring-plugin-core)
(Apache License, Version 2.0) Spring Plugin - Metadata Extension
(org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE -
https://github.com/spring-projects/spring-plugin/spring-plugin-metadata)
- (Apache License, Version 2.0) Spring Transaction
(org.springframework:spring-tx:5.3.15 -
https://github.com/spring-projects/spring-framework)
+ (Apache License, Version 2.0) Spring Transaction
(org.springframework:spring-tx:5.3.20 -
https://github.com/spring-projects/spring-framework)
(Apache License, Version 2.0) Spring Web
(org.springframework:spring-web:5.3.20 -
https://github.com/spring-projects/spring-framework)
(Apache License, Version 2.0) Spring Web MVC
(org.springframework:spring-webmvc:5.3.20 -
https://github.com/spring-projects/spring-framework)
(The Apache Software License, Version 2.0) springfox-core
(io.springfox:springfox-core:2.6.1 - https://github.com/springfox/springfox)
diff --git a/tools/dependencies/known-dependencies.txt
b/tools/dependencies/known-dependencies.txt
index c081cc76..861fe7f4 100644
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -39,10 +39,14 @@ log4j-1.2.17.jar
logback-classic-1.2.11.jar
logback-core-1.2.11.jar
mapstruct-1.0.0.Final.jar
-mybatis-3.5.9.jar
+jsqlparser-4.4.jar
+mybatis-3.5.10.jar
mybatis-spring-2.0.7.jar
-mybatis-spring-boot-autoconfigure-2.2.2.jar
-mybatis-spring-boot-starter-2.2.2.jar
+mybatis-plus-3.5.3.1.jar
+mybatis-plus-annotation-3.5.3.1.jar
+mybatis-plus-boot-starter-3.5.3.1.jar
+mybatis-plus-core-3.5.3.1.jar
+mybatis-plus-extension-3.5.3.1.jar
scala-library-2.11.12.jar
seatunnel-common-2.1.3.jar
seatunnel-config-base-2.1.1.jar
@@ -56,7 +60,7 @@ spring-boot-2.6.8.jar
spring-boot-autoconfigure-2.6.8.jar
spring-boot-starter-2.6.8.jar
spring-boot-starter-aop-2.6.8.jar
-spring-boot-starter-jdbc-2.6.3.jar
+spring-boot-starter-jdbc-2.6.8.jar
spring-boot-starter-jetty-2.6.8.jar
spring-boot-starter-json-2.6.8.jar
spring-boot-starter-logging-2.6.8.jar
@@ -65,10 +69,10 @@ spring-context-5.3.20.jar
spring-core-5.3.20.jar
spring-expression-5.3.20.jar
spring-jcl-5.3.20.jar
-spring-jdbc-5.3.15.jar
+spring-jdbc-5.3.20.jar
spring-plugin-core-1.2.0.RELEASE.jar
spring-plugin-metadata-1.2.0.RELEASE.jar
-spring-tx-5.3.15.jar
+spring-tx-5.3.20.jar
spring-web-5.3.20.jar
spring-webmvc-5.3.20.jar
springfox-core-2.6.1.jar
