From 54a31a76ce21769621878f424b07472e127cb2a9 Mon Sep 17 00:00:00 2001 From: Binit Shrestha <53391715+binitshrest@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:59:41 +0545 Subject: [PATCH] [Improvement-16507] Remove spring-boot-starter-cache (#16593) --- .../mapper/WorkflowDefinitionLogMapper.java | 7 +- dolphinscheduler-dist/release-docs/LICENSE | 3 - .../licenses/LICENSE-log4j-api-2.11.2.txt | 53 ----- .../licenses/LICENSE-log4j-core-2.11.2.txt | 202 ------------------ dolphinscheduler-master/pom.xml | 21 +- .../dolphinscheduler-registry-etcd/pom.xml | 10 + .../dolphinscheduler-registry-it/pom.xml | 10 + .../dolphinscheduler-registry-jdbc/pom.xml | 10 + .../pom.xml | 10 + pom.xml | 31 ++- tools/dependencies/known-dependencies.txt | 1 - 11 files changed, 78 insertions(+), 280 deletions(-) delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-log4j-api-2.11.2.txt delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-log4j-core-2.11.2.txt diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java index f2decf9849..e050d0fd60 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java @@ -23,9 +23,6 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.Cacheable; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -33,7 +30,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; /** * workflow definition log mapper interface */ -@CacheConfig(cacheNames = "processDefinition", keyGenerator = "cacheKeyGenerator") + public interface WorkflowDefinitionLogMapper extends BaseMapper { /** @@ -43,7 +40,7 @@ public interface WorkflowDefinitionLogMapper extends BaseMapperdolphinscheduler-eventbus ${project.version} - - - org.springframework.boot - spring-boot-starter-cache - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - - org.codehaus.janino janino @@ -283,6 +268,12 @@ org.springframework.boot spring-boot-starter-test test + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml index 0f5c4d1494..10a5ac8169 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml @@ -74,6 +74,16 @@ org.springframework.boot spring-boot-starter-test test + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml index 7f4b97d3ef..95cc0a3e47 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml @@ -35,6 +35,16 @@ org.springframework.boot spring-boot-starter-test test + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml index a11724a261..bb38d118f7 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml @@ -97,6 +97,16 @@ org.springframework.boot spring-boot-starter-test test + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml index 1d93ae87f1..36b6e3b521 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml @@ -96,6 +96,16 @@ org.springframework.boot spring-boot-starter-test test + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/pom.xml b/pom.xml index c833b2deab..80560f8334 100755 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,16 @@ org.apache.dolphinscheduler dolphinscheduler-master ${project.version} + + + org.apache.logging.log4j + log4j-to-slf4j + + + log4j + log4j + + org.apache.dolphinscheduler @@ -136,7 +146,6 @@ dolphinscheduler-ui ${project.version} - org.apache.dolphinscheduler dolphinscheduler-yarn-aop @@ -146,6 +155,16 @@ org.apache.dolphinscheduler dolphinscheduler-common ${project.version} + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + org.apache.dolphinscheduler @@ -250,6 +269,16 @@ org.apache.dolphinscheduler dolphinscheduler-extract-base ${project.version} + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + org.apache.dolphinscheduler diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index 0eaec4c579..f243e26416 100644 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -288,7 +288,6 @@ spring-boot-configuration-processor-2.6.1.jar spring-boot-starter-2.7.3.jar spring-boot-starter-actuator-2.7.3.jar spring-boot-starter-aop-2.7.3.jar -spring-boot-starter-cache-2.7.3.jar spring-boot-starter-jdbc-2.7.3.jar spring-boot-starter-jetty-2.7.3.jar spring-boot-starter-json-2.7.3.jar