You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2022/03/02 02:24:56 UTC
[dolphinscheduler] branch 2.0.5-prepare updated: Revert "[cherry-pick] upgrade mybatis-plus to 3.4.3 (#8539)" (#8644)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 2.0.5-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/2.0.5-prepare by this push:
new 43b4423 Revert "[cherry-pick] upgrade mybatis-plus to 3.4.3 (#8539)" (#8644)
43b4423 is described below
commit 43b44239154fe2e36cdb1a72f8af779d5125fe7e
Author: Jiajie Zhong <zh...@gmail.com>
AuthorDate: Wed Mar 2 10:24:37 2022 +0800
Revert "[cherry-pick] upgrade mybatis-plus to 3.4.3 (#8539)" (#8644)
This reverts commit 29ab135cbcbfed4e46b2dd3fcd2259e6ea31dd17.
---
.../dao/datasource/SpringConnectionFactory.java | 18 +++++++++---------
.../dolphinscheduler/dao/entity/ProcessDefinition.java | 3 +--
.../dolphinscheduler/dao/entity/ProcessInstance.java | 3 +--
.../dolphinscheduler/dao/entity/TaskDefinition.java | 3 +--
dolphinscheduler-dist/release-docs/LICENSE | 16 ++++++++--------
pom.xml | 4 ++--
tools/dependencies/known-dependencies.txt | 16 ++++++++--------
7 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
index 92e8077..ca7fc80 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
@@ -20,9 +20,7 @@ package org.apache.dolphinscheduler.dao.datasource;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.extension.MybatisMapWrapperFactory;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import org.apache.ibatis.mapping.DatabaseIdProvider;
import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
@@ -43,6 +41,11 @@ import java.util.Properties;
public class SpringConnectionFactory {
@Bean
+ public PaginationInterceptor paginationInterceptor() {
+ return new PaginationInterceptor();
+ }
+
+ @Bean
public DataSourceTransactionManager transactionManager(DataSource dataSource) {
return new DataSourceTransactionManager(dataSource);
}
@@ -54,19 +57,16 @@ public class SpringConnectionFactory {
configuration.setCacheEnabled(false);
configuration.setCallSettersOnNulls(true);
configuration.setJdbcTypeForNull(JdbcType.NULL);
- configuration.setObjectWrapperFactory(new MybatisMapWrapperFactory());
-
- MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
- mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor());
+ configuration.addInterceptor(paginationInterceptor());
+ configuration.setGlobalConfig(new GlobalConfig().setBanner(false));
MybatisSqlSessionFactoryBean sqlSessionFactoryBean = new MybatisSqlSessionFactoryBean();
sqlSessionFactoryBean.setConfiguration(configuration);
sqlSessionFactoryBean.setDataSource(dataSource);
- sqlSessionFactoryBean.setPlugins(mybatisPlusInterceptor);
GlobalConfig.DbConfig dbConfig = new GlobalConfig.DbConfig();
dbConfig.setIdType(IdType.AUTO);
- GlobalConfig globalConfig = new GlobalConfig().setBanner(false);
+ GlobalConfig globalConfig = new GlobalConfig();
globalConfig.setDbConfig(dbConfig);
sqlSessionFactoryBean.setGlobalConfig(globalConfig);
sqlSessionFactoryBean.setTypeAliasesPackage("org.apache.dolphinscheduler.dao.entity");
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
index 92735d0..4c4dfcf 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
@@ -22,8 +22,6 @@ import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.process.Property;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
-import org.apache.commons.lang3.StringUtils;
-
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -35,6 +33,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
index ae631f0..f20b13a 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
@@ -26,8 +26,6 @@ import org.apache.dolphinscheduler.common.enums.TaskDependType;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.utils.DateUtils;
-import org.apache.commons.lang3.StringUtils;
-
import java.util.Date;
import java.util.Objects;
@@ -35,6 +33,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
index 50e857c..8c47fbf 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
@@ -25,8 +25,6 @@ import org.apache.dolphinscheduler.common.enums.TimeoutFlag;
import org.apache.dolphinscheduler.common.process.Property;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
-import org.apache.commons.lang3.StringUtils;
-
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -38,6 +36,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE
index a9e5d87..9fd8e16 100644
--- a/dolphinscheduler-dist/release-docs/LICENSE
+++ b/dolphinscheduler-dist/release-docs/LICENSE
@@ -323,7 +323,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
jna-platform 4.5.2: https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform/4.5.2, Apache 2.0 and LGPL 2.1
joda-time 2.5: https://github.com/JodaOrg/joda-time, Apache 2.0
jpam 1.1: https://mvnrepository.com/artifact/net.sf.jpam/jpam/1.1, Apache 2.0
- jsqlparser 4.0: https://github.com/JSQLParser/JSqlParser, Apache 2.0 or LGPL 2.1
+ jsqlparser 2.1: https://github.com/JSQLParser/JSqlParser, Apache 2.0 or LGPL 2.1
jsr305 3.0.0: https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305, Apache 2.0
j2objc-annotations 1.1 https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/1.1, Apache 2.0
libfb303 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libfb303/0.9.3, Apache 2.0
@@ -334,13 +334,13 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
log4j-1.2-api 2.14.1: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api/2.14.1, Apache 2.0
lz4 1.3.0: https://mvnrepository.com/artifact/net.jpountz.lz4/lz4/1.3.0, Apache 2.0
mapstruct 1.2.0.Final: https://github.com/mapstruct/mapstruct, Apache 2.0
- mybatis 3.5.7 https://mvnrepository.com/artifact/org.mybatis/mybatis/3.5.7, Apache 2.0
- mybatis-plus 3.4.3: https://github.com/baomidou/mybatis-plus, Apache 2.0
- mybatis-plus-annotation 3.4.3: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-annotation/3.4.3, Apache 2.0
- mybatis-plus-boot-starter 3.4.3: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter/3.4.3, Apache 2.0
- mybatis-plus-core 3.4.3: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-core/3.4.3, Apache 2.0
- mybatis-plus-extension 3.4.3: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-extension/3.4.3, Apache 2.0
- mybatis-spring 2.0.6: https://mvnrepository.com/artifact/org.mybatis/mybatis-spring/2.0.6, Apache 2.0
+ mybatis 3.5.2 https://mvnrepository.com/artifact/org.mybatis/mybatis/3.5.2, Apache 2.0
+ mybatis-plus 3.2.0: https://github.com/baomidou/mybatis-plus, Apache 2.0
+ mybatis-plus-annotation 3.2.0: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-annotation/3.2.0, Apache 2.0
+ mybatis-plus-boot-starter 3.2.0: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter/3.2.0, Apache 2.0
+ mybatis-plus-core 3.2.0: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-core/3.2.0, Apache 2.0
+ mybatis-plus-extension 3.2.0: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-extension/3.2.0, Apache 2.0
+ mybatis-spring 2.0.2: https://mvnrepository.com/artifact/org.mybatis/mybatis-spring/2.0.2, Apache 2.0
netty 3.6.2.Final: https://github.com/netty/netty, Apache 2.0
netty 4.1.53.Final: https://github.com/netty/netty/blob/netty-4.1.53.Final/LICENSE.txt, Apache 2.0
opencsv 2.3: https://mvnrepository.com/artifact/net.sf.opencsv/opencsv/2.3, Apache 2.0
diff --git a/pom.xml b/pom.xml
index 5d487a9..c1e0564 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,8 +66,8 @@
<hadoop.version>2.7.3</hadoop.version>
<quartz.version>2.3.0</quartz.version>
<jackson.version>2.10.5</jackson.version>
- <mybatis-plus.version>3.4.3</mybatis-plus.version>
- <mybatis.spring.version>2.0.6</mybatis.spring.version>
+ <mybatis-plus.version>3.2.0</mybatis-plus.version>
+ <mybatis.spring.version>2.0.1</mybatis.spring.version>
<cron.utils.version>9.1.3</cron.utils.version>
<druid.version>1.2.4</druid.version>
<h2.version>1.4.200</h2.version>
diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt
index a622b05..73add95 100755
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -139,7 +139,7 @@ joda-time-2.5.jar
jpam-1.1.jar
jsch-0.1.42.jar
jsp-api-2.1.jar
-jsqlparser-4.0.jar
+jsqlparser-2.1.jar
jsr305-3.0.0.jar
jta-1.1.jar
jul-to-slf4j-1.7.32.jar
@@ -153,13 +153,13 @@ logback-core-1.2.3.jar
lz4-1.3.0.jar
mapstruct-1.2.0.Final.jar
mssql-jdbc-6.1.0.jre8.jar
-mybatis-3.5.7.jar
-mybatis-plus-3.4.3.jar
-mybatis-plus-annotation-3.4.3.jar
-mybatis-plus-boot-starter-3.4.3.jar
-mybatis-plus-core-3.4.3.jar
-mybatis-plus-extension-3.4.3.jar
-mybatis-spring-2.0.6.jar
+mybatis-3.5.2.jar
+mybatis-plus-3.2.0.jar
+mybatis-plus-annotation-3.2.0.jar
+mybatis-plus-boot-starter-3.2.0.jar
+mybatis-plus-core-3.2.0.jar
+mybatis-plus-extension-3.2.0.jar
+mybatis-spring-2.0.2.jar
netty-3.6.2.Final.jar
netty-all-4.1.53.Final.jar
opencsv-2.3.jar