From d86b0e6e677a588b2793eaf18a2abd37d11a1653 Mon Sep 17 00:00:00 2001
From: agapple <jianghang115@gmail.com>
Date: Wed, 25 Sep 2019 19:16:33 +0800
Subject: [PATCH] fixed  testcase

---
 client-adapter/es6x/pom.xml                   |  2 +-
 ...ser_single.yml_ => mytest_user_single.yml} |  0
 client-adapter/es7x/pom.xml                   |  2 +-
 client-adapter/{es-core => escore}/pom.xml    |  4 ++--
 .../client/adapter/es/core/ESAdapter.java     |  0
 .../adapter/es/core/config/ESSyncConfig.java  |  0
 .../es/core/config/ESSyncConfigLoader.java    |  0
 .../adapter/es/core/config/SchemaItem.java    |  0
 .../adapter/es/core/config/SqlParser.java     |  0
 .../es/core/monitor/ESConfigMonitor.java      |  0
 .../es/core/service/ESSyncService.java        |  0
 .../es/core/support/ESBulkRequest.java        |  0
 .../adapter/es/core/support/ESSyncUtil.java   |  0
 .../adapter/es/core/support/ESTemplate.java   |  0
 client-adapter/pom.xml                        |  8 +++----
 dbsync/pom.xml                                | 10 --------
 driver/pom.xml                                | 10 --------
 parse/pom.xml                                 | 10 --------
 pom.xml                                       | 24 +++++++++++++++++++
 19 files changed, 32 insertions(+), 38 deletions(-)
 rename client-adapter/es6x/src/test/resources/es6/{mytest_user_single.yml_ => mytest_user_single.yml} (100%)
 rename client-adapter/{es-core => escore}/pom.xml (92%)
 rename client-adapter/{es-core => escore}/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java (100%)
 rename client-adapter/{es-core => escore}/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfig.java (100%)
 rename client-adapter/{es-core => escore}/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfigLoader.java (100%)
 rename client-adapter/{es-core => escore}/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SchemaItem.java (100%)
 rename client-adapter/{es-core => escore}/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SqlParser.java (100%)
 rename client-adapter/{es-core => escore}/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/monitor/ESConfigMonitor.java (100%)
 rename client-adapter/{es-core => escore}/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/service/ESSyncService.java (100%)
 rename client-adapter/{es-core => escore}/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESBulkRequest.java (100%)
 rename client-adapter/{es-core => escore}/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESSyncUtil.java (100%)
 rename client-adapter/{es-core => escore}/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESTemplate.java (100%)

diff --git a/client-adapter/es6x/pom.xml b/client-adapter/es6x/pom.xml
index 1056b71a..a2bf543b 100644
--- a/client-adapter/es6x/pom.xml
+++ b/client-adapter/es6x/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>com.alibaba.otter</groupId>
-            <artifactId>client-adapter.es-core</artifactId>
+            <artifactId>client-adapter.escore</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/client-adapter/es6x/src/test/resources/es6/mytest_user_single.yml_ b/client-adapter/es6x/src/test/resources/es6/mytest_user_single.yml
similarity index 100%
rename from client-adapter/es6x/src/test/resources/es6/mytest_user_single.yml_
rename to client-adapter/es6x/src/test/resources/es6/mytest_user_single.yml
diff --git a/client-adapter/es7x/pom.xml b/client-adapter/es7x/pom.xml
index 8083d176..72b9ff03 100644
--- a/client-adapter/es7x/pom.xml
+++ b/client-adapter/es7x/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>com.alibaba.otter</groupId>
-            <artifactId>client-adapter.es-core</artifactId>
+            <artifactId>client-adapter.escore</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/client-adapter/es-core/pom.xml b/client-adapter/escore/pom.xml
similarity index 92%
rename from client-adapter/es-core/pom.xml
rename to client-adapter/escore/pom.xml
index af8aaacc..6b351c5c 100644
--- a/client-adapter/es-core/pom.xml
+++ b/client-adapter/escore/pom.xml
@@ -9,9 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
-    <artifactId>client-adapter.es-core</artifactId>
+    <artifactId>client-adapter.escore</artifactId>
     <packaging>jar</packaging>
-    <name>canal client adapter es-core module for otter ${project.version}</name>
+    <name>canal client adapter escore module for otter ${project.version}</name>
 
     <dependencies>
         <dependency>
diff --git a/client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java
similarity index 100%
rename from client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java
rename to client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java
diff --git a/client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfig.java b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfig.java
similarity index 100%
rename from client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfig.java
rename to client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfig.java
diff --git a/client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfigLoader.java b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfigLoader.java
similarity index 100%
rename from client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfigLoader.java
rename to client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfigLoader.java
diff --git a/client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SchemaItem.java b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SchemaItem.java
similarity index 100%
rename from client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SchemaItem.java
rename to client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SchemaItem.java
diff --git a/client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SqlParser.java b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SqlParser.java
similarity index 100%
rename from client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SqlParser.java
rename to client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SqlParser.java
diff --git a/client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/monitor/ESConfigMonitor.java b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/monitor/ESConfigMonitor.java
similarity index 100%
rename from client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/monitor/ESConfigMonitor.java
rename to client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/monitor/ESConfigMonitor.java
diff --git a/client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/service/ESSyncService.java b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/service/ESSyncService.java
similarity index 100%
rename from client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/service/ESSyncService.java
rename to client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/service/ESSyncService.java
diff --git a/client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESBulkRequest.java b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESBulkRequest.java
similarity index 100%
rename from client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESBulkRequest.java
rename to client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESBulkRequest.java
diff --git a/client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESSyncUtil.java b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESSyncUtil.java
similarity index 100%
rename from client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESSyncUtil.java
rename to client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESSyncUtil.java
diff --git a/client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESTemplate.java b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESTemplate.java
similarity index 100%
rename from client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESTemplate.java
rename to client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESTemplate.java
diff --git a/client-adapter/pom.xml b/client-adapter/pom.xml
index 8d261256..4fc3547f 100644
--- a/client-adapter/pom.xml
+++ b/client-adapter/pom.xml
@@ -23,9 +23,9 @@
         <module>elasticsearch</module>
         <module>launcher</module>
         <module>rdb</module>
-        <module>es_6.x</module>
-        <module>es_7.x</module>
-        <module>es-core</module>
+        <module>es6x</module>
+        <module>es7x</module>
+        <module>escore</module>
     </modules>
 
     <licenses>
@@ -123,4 +123,4 @@
             <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/dbsync/pom.xml b/dbsync/pom.xml
index 1fde6e0c..70c3e0bf 100644
--- a/dbsync/pom.xml
+++ b/dbsync/pom.xml
@@ -47,31 +47,21 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.diffblue</groupId>
             <artifactId>deeptestutils</artifactId>
-            <version>1.9.0</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>
diff --git a/driver/pom.xml b/driver/pom.xml
index 3e3f6812..483baa3a 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -42,31 +42,21 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.diffblue</groupId>
             <artifactId>deeptestutils</artifactId>
-            <version>1.9.0</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>
diff --git a/parse/pom.xml b/parse/pom.xml
index 8b25fdae..60c2ea93 100644
--- a/parse/pom.xml
+++ b/parse/pom.xml
@@ -95,31 +95,21 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.diffblue</groupId>
             <artifactId>deeptestutils</artifactId>
-            <version>1.9.0</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>
diff --git a/pom.xml b/pom.xml
index 3ac2e2c0..ac7ee0e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -301,6 +301,30 @@
                 <version>4.12</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito</artifactId>
+                <version>1.6.5</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-junit4</artifactId>
+                <version>1.6.5</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>1.10.19</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.diffblue</groupId>
+                <artifactId>deeptestutils</artifactId>
+                <version>1.9.0</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>