Commit 88423748 authored by Tboy's avatar Tboy Committed by qiaozhanwei
Browse files

remove commons-lang3 dependancy, using common-module instead for server module (#1698) 

* remove commons-lang3 dependancy

* remove commons-lang3 and commons-lang dependancy

* remove commons-collections4/commons-logging/commons-io dependancy

* tmp add commons-lang3 for compile

* remove commons-lang3 dependancy, using common-module instead

* remove common StringUtils instead of lang3

* add tmp lang3 for compile
parent 3477d28d

dolphinscheduler-api/pom.xml

+5 −0
Original line number Diff line number Diff line
@@ -162,6 +162,11 @@ 
      <artifactId>commons-collections</artifactId>

    </dependency>



    <dependency>

      <groupId>org.apache.commons</groupId>

      <artifactId>commons-lang3</artifactId>

    </dependency>



    <dependency>

      <groupId>org.quartz-scheduler</groupId>

      <artifactId>quartz</artifactId>

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/EnumUtils.java

+12 −0
Original line number Diff line number Diff line
@@ -30,4 +30,16 @@ public class EnumUtils { 
            return null;

        }

    }



    public static <E extends Enum<E>> boolean isValidEnum(final Class<E> enumClass, final String enumName) {

        if (enumName == null) {

            return false;

        }

        try {

            Enum.valueOf(enumClass, enumName);

            return true;

        } catch (final IllegalArgumentException ex) {

            return false;

        }

    }

}

dolphinscheduler-server/pom.xml

+0 −5
Original line number Diff line number Diff line
@@ -111,11 +111,6 @@ 
			<artifactId>dolphinscheduler-alert</artifactId>

		</dependency>



		<dependency>

			<groupId>org.apache.commons</groupId>

			<artifactId>commons-lang3</artifactId>

		</dependency>



    </dependencies>

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
 */

package org.apache.dolphinscheduler.server.master;



import org.apache.commons.lang3.StringUtils;

import org.apache.dolphinscheduler.common.Constants;

import org.apache.dolphinscheduler.common.IStoppable;

import org.apache.dolphinscheduler.common.thread.Stopper;
@@ -24,6 +23,7 @@ import org.apache.dolphinscheduler.common.thread.ThreadPoolExecutors; 
import org.apache.dolphinscheduler.common.thread.ThreadUtils;

import org.apache.dolphinscheduler.common.utils.OSUtils;

import org.apache.dolphinscheduler.common.utils.SpringApplicationContext;

import org.apache.dolphinscheduler.common.utils.StringUtils;

import org.apache.dolphinscheduler.dao.ProcessDao;

import org.apache.dolphinscheduler.server.master.config.MasterConfig;

import org.apache.dolphinscheduler.server.master.runner.MasterSchedulerThread;

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package org.apache.dolphinscheduler.server.master.runner; 


import com.alibaba.fastjson.JSONObject;

import org.apache.commons.io.FileUtils;

import org.apache.commons.lang3.StringUtils;

import org.apache.dolphinscheduler.common.Constants;

import org.apache.dolphinscheduler.common.enums.*;

import org.apache.dolphinscheduler.common.graph.DAG;