fix conflict

Author: todd5167

core/src/main/java/com/dtstack/flink/sql/environment/StreamEnvConfigManager.java

@@ -18,6 +18,12 @@
 
 package com.dtstack.flink.sql.environment;
 
+import com.dtstack.flink.sql.constrant.ConfigConstrant;
+import com.dtstack.flink.sql.enums.EStateBackend;
+import com.dtstack.flink.sql.util.MathUtil;
+import com.dtstack.flink.sql.util.PropertiesUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.restartstrategy.RestartStrategies;
 import org.apache.flink.api.common.time.Time;

hbase/pom.xml

@@ -29,13 +29,7 @@
             <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-		    <groupId>jdk.tools</groupId>
-		    <artifactId>jdk.tools</artifactId>
-		    <version>1.6</version>
-		    <scope>system</scope>
-		    <systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
-		</dependency>
+
 
         <dependency>
             <groupId>org.apache.hbase</groupId>