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 @@ com.alibaba.otter - client-adapter.es-core + client-adapter.escore ${project.version} 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 @@ com.alibaba.otter - client-adapter.es-core + client-adapter.escore ${project.version} 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 @@ 4.0.0 com.alibaba.otter - client-adapter.es-core + client-adapter.escore jar - canal client adapter es-core module for otter ${project.version} + canal client adapter escore module for otter ${project.version} 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 @@ elasticsearch launcher rdb - es_6.x - es_7.x - es-core + es6x + es7x + escore @@ -123,4 +123,4 @@ https://oss.sonatype.org/service/local/staging/deploy/maven2/ - \ No newline at end of file + 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 @@ org.powermock powermock-api-mockito - 1.6.5 test org.powermock powermock-module-junit4 - 1.6.5 test org.mockito mockito-all - 1.10.19 - test - - - junit - junit - 4.8.2 test com.diffblue deeptestutils - 1.9.0 test 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 @@ org.powermock powermock-api-mockito - 1.6.5 test org.powermock powermock-module-junit4 - 1.6.5 test org.mockito mockito-all - 1.10.19 - test - - - junit - junit - 4.8.2 test com.diffblue deeptestutils - 1.9.0 test 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 @@ org.powermock powermock-api-mockito - 1.6.5 test org.powermock powermock-module-junit4 - 1.6.5 test org.mockito mockito-all - 1.10.19 - test - - - junit - junit - 4.8.2 test com.diffblue deeptestutils - 1.9.0 test diff --git a/pom.xml b/pom.xml index 3ac2e2c0..ac7ee0e3 100644 --- a/pom.xml +++ b/pom.xml @@ -301,6 +301,30 @@ 4.12 test + + org.powermock + powermock-api-mockito + 1.6.5 + test + + + org.powermock + powermock-module-junit4 + 1.6.5 + test + + + org.mockito + mockito-all + 1.10.19 + test + + + com.diffblue + deeptestutils + 1.9.0 + test + mysql mysql-connector-java