skip merge master 冗余

DTStack · Aug 22, 2019 · 8df03c0 · 8df03c0
1 parent 38ab0a7
commit 8df03c0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 28 deletions.
diff --git a/pipeline/inputs/binlog/pom.xml b/pipeline/inputs/binlog/pom.xml
@@ -174,22 +174,6 @@
             <groupId>com.alibaba.otter</groupId>
             <artifactId>canal.common</artifactId>
             <version>1.1.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-core</artifactId>
-                </exclusion>
-
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>jcl-over-slf4j</artifactId>
-                </exclusion>
-
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

diff --git a/pipeline/inputs/kafka10/pom.xml b/pipeline/inputs/kafka10/pom.xml
@@ -119,12 +119,5 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
-		<dependency>
-			<groupId>com.dtstack.jlogstash</groupId>
-			<artifactId>jlogstash</artifactId>
-			<version>1.0.0</version>
-			<scope>provided</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/pipeline/outputs/kafka/src/main/java/com/dtstack/jlogstash/outputs/Kafka.java b/pipeline/outputs/kafka/src/main/java/com/dtstack/jlogstash/outputs/Kafka.java
@@ -71,11 +71,6 @@ public class Kafka extends BaseOutput {
 
 	private static Map<String,String> producerSettings;
 
-	static{
-		Thread.currentThread().setContextClassLoader(null);
-	}
-
-
 	@SuppressWarnings("rawtypes")
 	public Kafka(Map config) {
 		super(config);