Merge remote-tracking branch 'github_jlogstash/master' into v3.7.1

jiemotongxue · jiemotongxue · commit 38ab0a74e301 · 2019-08-22T16:41:16.000+08:00
diff --git a/core/src/test/java/com/dtstack/jlogstash/Test.java b/core/src/test/java/com/dtstack/jlogstash/Test.java
@@ -0,0 +1,14 @@
+package com.dtstack.jlogstash;
+
+import java.io.IOException;
+
+/**
+ * Created by sishu.yss on 2018/11/17.
+ */
+public class Test {
+
+    public static void main(String[] args) throws IOException {
+        String[] cmd = { "sh", "-c", "ls > /Users/sishuyss/1.txt" };
+        Runtime.getRuntime().exec(cmd);
+    }
+}
diff --git a/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/filters/UA.java b/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/filters/UA.java
@@ -22,7 +22,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.dtstack.jlogstash.annotation.Required;
-import com.dtstack.jlogstash.ua.parser.UserAgentUtil;
+import com.dtstack.jlogstash.parser.UserAgentUtil;
 import com.google.common.collect.Maps;
 
 
diff --git a/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/CachingParser.java b/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/CachingParser.java
@@ -15,20 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.dtstack.jlogstash.ua.parser;
+package com.dtstack.jlogstash.parser;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
 import org.apache.commons.collections.map.LRUMap;
 
-import com.dtstack.jlogstash.ua.parser.Client;
-import com.dtstack.jlogstash.ua.parser.Device;
-import com.dtstack.jlogstash.ua.parser.OS;
-import com.dtstack.jlogstash.ua.parser.Parser;
-import com.dtstack.jlogstash.ua.parser.UserAgent;
-
 /**
  * When doing webanalytics (with for example PIG) the main pattern is to process
  * weblogs in clickstreams. A basic fact about common clickstreams is that in
diff --git a/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/Client.java b/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/Client.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dtstack.jlogstash.ua.parser;
+package com.dtstack.jlogstash.parser;
 
 
 /**
diff --git a/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/Device.java b/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/Device.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dtstack.jlogstash.ua.parser;
+package com.dtstack.jlogstash.parser;
 
 import java.util.Map;
 
diff --git a/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/DeviceParser.java b/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/DeviceParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dtstack.jlogstash.ua.parser;
+package com.dtstack.jlogstash.parser;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/OS.java b/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/OS.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dtstack.jlogstash.ua.parser;
+package com.dtstack.jlogstash.parser;
 
 import java.util.Map;
 
diff --git a/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/OSParser.java b/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/OSParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dtstack.jlogstash.ua.parser;
+package com.dtstack.jlogstash.parser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/Parser.java b/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/Parser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dtstack.jlogstash.ua.parser;
+package com.dtstack.jlogstash.parser;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/UserAgent.java b/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/UserAgent.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dtstack.jlogstash.ua.parser;
+package com.dtstack.jlogstash.parser;
 
 import java.util.Map;
 
diff --git a/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/UserAgentParser.java b/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/UserAgentParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dtstack.jlogstash.ua.parser;
+package com.dtstack.jlogstash.parser;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/UserAgentUtil.java b/pipeline/filters/ua/src/main/java/com/dtstack/jlogstash/parser/UserAgentUtil.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.dtstack.jlogstash.ua.parser;
+package com.dtstack.jlogstash.parser;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/pipeline/inputs/binlog/pom.xml b/pipeline/inputs/binlog/pom.xml
@@ -174,6 +174,22 @@
             <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,5 +119,12 @@
 				</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
@@ -80,6 +80,10 @@ public class Kafka extends BaseOutput {
 	public Kafka(Map config) {
 		super(config);
 	}
+
+	static{
+		Thread.currentThread().setContextClassLoader(null);
+	}
 	
 	/**
 	 * default
