diff --git a/client/datacap-cli/pom.xml b/client/datacap-cli/pom.xml index 2ae716bc..fc835b8e 100644 --- a/client/datacap-cli/pom.xml +++ b/client/datacap-cli/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/core/datacap-captcha/pom.xml b/core/datacap-captcha/pom.xml index 5d0c5723..3464eaf8 100644 --- a/core/datacap-captcha/pom.xml +++ b/core/datacap-captcha/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/core/datacap-common/pom.xml b/core/datacap-common/pom.xml index b718fca0..428556bb 100644 --- a/core/datacap-common/pom.xml +++ b/core/datacap-common/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/core/datacap-parser/pom.xml b/core/datacap-parser/pom.xml index 70f60af8..e824a2e6 100644 --- a/core/datacap-parser/pom.xml +++ b/core/datacap-parser/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/core/datacap-security/pom.xml b/core/datacap-security/pom.xml index 9f8d115e..9da61691 100644 --- a/core/datacap-security/pom.xml +++ b/core/datacap-security/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/core/datacap-server/pom.xml b/core/datacap-server/pom.xml index 6f4b5161..0824be63 100644 --- a/core/datacap-server/pom.xml +++ b/core/datacap-server/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/core/datacap-server/src/main/java/io/edurt/datacap/server/scheduled/SourceScheduledRunnable.java b/core/datacap-server/src/main/java/io/edurt/datacap/server/scheduled/SourceScheduledRunnable.java deleted file mode 100644 index 478a354c..00000000 --- a/core/datacap-server/src/main/java/io/edurt/datacap/server/scheduled/SourceScheduledRunnable.java +++ /dev/null @@ -1,219 +0,0 @@ -package io.edurt.datacap.server.scheduled; - -import com.google.inject.Injector; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import io.edurt.datacap.common.enums.Type; -import io.edurt.datacap.common.utils.JsonUtils; -import io.edurt.datacap.schedule.ScheduledRunnable; -import io.edurt.datacap.service.common.PluginUtils; -import io.edurt.datacap.service.entity.SourceEntity; -import io.edurt.datacap.service.entity.TemplateSqlEntity; -import io.edurt.datacap.service.itransient.SqlConfigure; -import io.edurt.datacap.service.repository.SourceRepository; -import io.edurt.datacap.service.repository.TemplateSqlRepository; -import io.edurt.datacap.spi.Plugin; -import io.edurt.datacap.spi.model.Configure; -import io.edurt.datacap.spi.model.Response; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.core.env.Environment; -import org.springframework.data.redis.core.RedisTemplate; - -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -@Slf4j -@SuppressFBWarnings(value = "REC_CATCH_EXCEPTION") -public class SourceScheduledRunnable - extends ScheduledRunnable -{ - public static final String DATABASE = "database"; - public static final String TABLE = "table"; - private static final String GET_ALL_DATABASES = "getAllDatabase"; - private static final String GET_ALL_TABLES = "getAllTablesFromDatabase"; - private static final String GET_ALL_COLUMNS = "getAllColumnsFromDatabaseAndTable"; - - private final Injector injector; - private final SourceRepository sourceRepository; - private final TemplateSqlRepository templateSqlRepository; - private final RedisTemplate redisTemplate; - private final Environment environment; - - private int maxSuggestions; - - public SourceScheduledRunnable(String name, Injector injector, SourceRepository sourceRepository, TemplateSqlRepository templateSqlRepository, RedisTemplate redisTemplate, Environment environment) - { - super(name); - this.injector = injector; - this.sourceRepository = sourceRepository; - this.templateSqlRepository = templateSqlRepository; - this.redisTemplate = redisTemplate; - this.environment = environment; - this.maxSuggestions = Integer.parseInt(environment.getProperty("datacap.editor.sugs.maxSize")); - } - - @Override - public void run() - { - this.sourceRepository.findAll().forEach(entity -> { - log.info("==================== {} ---> {} started =================", this.getName(), entity.getName()); - Optional pluginOptional = PluginUtils.getPluginByNameAndType(this.injector, entity.getType(), entity.getProtocol()); - if (!pluginOptional.isPresent()) { - log.warn("The scheduled task <{}> source {} protocol {} is not available", this.getName(), entity.getType(), entity.getProtocol()); - } - else { - long startTime = System.currentTimeMillis(); - String name = String.format("%s_%s", entity.getName(), entity.getId()); - log.info("The scheduled task <{}> execution start - child:{} start with {}", this.getName(), name, startTime); - // Get all databases - TemplateSqlEntity getAllDatabaseEntity = this.templateSqlRepository.findByNameAndPluginContaining(GET_ALL_DATABASES, entity.getType()); - if (ObjectUtils.isEmpty(getAllDatabaseEntity)) { - log.warn("The scheduled task {} template {} is not available", this.getName(), entity.getName(), GET_ALL_DATABASES); - } - else { - // Clear redis cache - String key = String.join("_", entity.getType(), entity.getId().toString()); - long counter = redisTemplate.opsForSet().size(key); - redisTemplate.delete(key); - log.info("The scheduled task {} child {} type {} find keys counter: {} is cleaned", this.getName(), entity.getName(), entity.getType(), counter); - this.processDatabase(entity, getContent(getAllDatabaseEntity, null), pluginOptional.get(), DATABASE, key); - } - long endTime = System.currentTimeMillis(); - long times = endTime - startTime; - log.info("The scheduled task <{}> execution end - child:{} end with {} consuming:{} millisecond", this.getName(), name, endTime, times); - } - log.info("==================== {} ---> {} end =================", this.getName(), entity.getName()); - }); - } - - private Configure getConfigure(SourceEntity entity) - { - Configure configure = new Configure(); - configure.setHost(entity.getHost()); - configure.setPort(entity.getPort()); - configure.setUsername(Optional.ofNullable(entity.getUsername())); - configure.setPassword(Optional.ofNullable(entity.getPassword())); - Optional database = StringUtils.isNotEmpty(entity.getDatabase()) ? Optional.ofNullable(entity.getDatabase()) : Optional.empty(); - configure.setDatabase(database); - configure.setSsl(Optional.ofNullable(entity.getSsl())); - configure.setEnv(Optional.ofNullable(entity.getConfigures())); - return configure; - } - - private String getContent(TemplateSqlEntity entity, Map configure) - { - try { - if (ObjectUtils.isNotEmpty(entity.getConfigure())) { - final String[] content = {entity.getContent()}; - List configures = JsonUtils.objectmapper.readValue(entity.getConfigure(), List.class); - configure.entrySet().forEach(value -> { - Optional sqlConfigure = configures.stream().filter(v -> String.valueOf(v.get("column")).equalsIgnoreCase(value.getKey())).map(v -> { - SqlConfigure configure1 = new SqlConfigure(); - configure1.setColumn(v.get("column").toString()); - configure1.setType(Type.valueOf(String.valueOf(v.get("type")))); - configure1.setExpression(String.valueOf(v.get("expression"))); - return configure1; - }).findFirst(); - if (sqlConfigure.isPresent()) { - content[0] = content[0].replace(sqlConfigure.get().getExpression(), String.valueOf(value.getValue())); - } - }); - return content[0]; - } - } - catch (Exception e) { - log.warn("Failed to analysis"); - return entity.getContent(); - } - return entity.getContent(); - } - - /** - * Get all databases of the configuration data source and buffer them to Redis - */ - private void processDatabase(SourceEntity entity, String content, Plugin plugin, String type, String key) - { - plugin.connect(getConfigure(entity)); - Response response = plugin.execute(content); - if (response.getIsSuccessful()) { - TemplateSqlEntity getAllTableEntity = templateSqlRepository.findByNameAndPluginContaining(GET_ALL_TABLES, entity.getType()); - if (ObjectUtils.isEmpty(getAllTableEntity)) { - log.warn("The scheduled task {} template {} is not available", this.getName(), entity.getName(), GET_ALL_TABLES); - } - else { - response.getColumns() - .stream() - .limit(maxSuggestions) - .forEach(column -> { - String database = ((List) column).get(0); - log.info("The scheduled task {} child {} sync data from source : {}", this.getName(), entity.getName(), database); - Map configure = new HashMap<>(); - configure.put("database", database); - this.processTable(entity, this.getContent(getAllTableEntity, configure), database, plugin, key); - }); - } - } - else { - log.warn("The scheduled task {} child {} type {} sync data from source is failed {}", this.getName(), entity.getName(), type, response.getMessage()); - } - plugin.destroy(); - } - - private void processTable(SourceEntity entity, String content, String database, Plugin plugin, String key) - { - plugin.connect(getConfigure(entity)); - Response response = plugin.execute(content); - if (response.getIsSuccessful()) { - TemplateSqlEntity getAllChildEntity = templateSqlRepository.findByNameAndPluginContaining(GET_ALL_COLUMNS, entity.getType()); - if (ObjectUtils.isEmpty(getAllChildEntity)) { - log.warn("The scheduled task {} template {} is not available", this.getName(), entity.getName(), GET_ALL_COLUMNS); - } - else { - response.getColumns() - .stream() - .limit(maxSuggestions) - .forEach(column -> { - String table = ((List) column).get(0); - log.info("The scheduled task {} child {} database {} sync data from source is : {}", this.getName(), entity.getName(), database, table); - Map configure = new HashMap<>(); - configure.put("table", String.join(".", database, table)); - this.processColumn(entity, this.getContent(getAllChildEntity, configure), database, table, plugin, key); - }); - } - } - else { - log.warn("The scheduled task {} child {} database {} sync data from source is failed {}", this.getName(), entity.getName(), database, response.getMessage()); - } - plugin.destroy(); - } - - private void processColumn(SourceEntity entity, String content, String database, String table, Plugin plugin, String key) - { - plugin.connect(getConfigure(entity)); - Response response = plugin.execute(content); - if (response.getIsSuccessful()) { - TemplateSqlEntity getAllChildEntity = templateSqlRepository.findByNameAndPluginContaining(GET_ALL_COLUMNS, entity.getType()); - if (ObjectUtils.isEmpty(getAllChildEntity)) { - log.warn("The scheduled task {} template {} is not available", this.getName(), entity.getName(), GET_ALL_COLUMNS); - } - else { - response.getColumns() - .stream() - .limit(maxSuggestions) - .forEach(column -> { - String value = ((List) column).get(0); - log.info("The scheduled task {} child {} database {} table {} sync data from source is : {}", this.getName(), entity.getName(), database, table, value); - redisTemplate.opsForSet().add(key, String.join(".", database, table, value)); - }); - } - } - else { - log.warn("The scheduled task {} child {} database {} table {} sync data from source is failed {}", this.getName(), entity.getName(), database, table, response.getMessage()); - } - plugin.destroy(); - } -} diff --git a/core/datacap-server/src/main/schema/1.17.0/schema.sql b/core/datacap-server/src/main/schema/1.17.0/schema.sql new file mode 100644 index 00000000..4b34de2c --- /dev/null +++ b/core/datacap-server/src/main/schema/1.17.0/schema.sql @@ -0,0 +1,3 @@ +DELETE +FROM `template_sql` +WHERE `name` in ('getAllDatabase', 'getAllDatabaseAndTable', 'getAllTablesFromDatabase', 'getAllColumnsFromDatabaseAndTable'); diff --git a/core/datacap-service/pom.xml b/core/datacap-service/pom.xml index 56f8b6bc..12662889 100644 --- a/core/datacap-service/pom.xml +++ b/core/datacap-service/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/core/datacap-spi/pom.xml b/core/datacap-spi/pom.xml index 3d463edf..98f3916e 100644 --- a/core/datacap-spi/pom.xml +++ b/core/datacap-spi/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/core/datacap-web/package.json b/core/datacap-web/package.json index 5af61471..a5b857a5 100644 --- a/core/datacap-web/package.json +++ b/core/datacap-web/package.json @@ -1,7 +1,7 @@ { "name": "datacap-console", "description": "DataCap console", - "version": "1.16.0", + "version": "1.17.0-SNAPSHOT", "private": true, "scripts": { "dev": "vue-cli-service serve", diff --git a/core/datacap-web/src/components/common/DataLazyTree.vue b/core/datacap-web/src/components/common/DataLazyTree.vue deleted file mode 100644 index 4a0acc0d..00000000 --- a/core/datacap-web/src/components/common/DataLazyTree.vue +++ /dev/null @@ -1,139 +0,0 @@ - - diff --git a/core/datacap-web/src/components/common/DatabaseTree.vue b/core/datacap-web/src/components/common/DatabaseTree.vue deleted file mode 100644 index 6fa7d50b..00000000 --- a/core/datacap-web/src/components/common/DatabaseTree.vue +++ /dev/null @@ -1,106 +0,0 @@ - - diff --git a/core/datacap-web/src/router/default.ts b/core/datacap-web/src/router/default.ts index ddd19135..7bd8935e 100644 --- a/core/datacap-web/src/router/default.ts +++ b/core/datacap-web/src/router/default.ts @@ -130,12 +130,6 @@ const createDefaultRouter = (router: any) => { meta: {title: 'common.source'}, layout: LayoutContainer, component: () => import("../views/admin/source/SourceManager.vue") - }, - { - path: "source/:id/managerBeta", - meta: {title: 'common.source'}, - layout: LayoutContainer, - component: () => import("../views/admin/source/SourceManagerBeta.vue") } ] }) diff --git a/core/datacap-web/src/services/source/MangerService.ts b/core/datacap-web/src/services/source/MangerService.ts deleted file mode 100644 index 9676782e..00000000 --- a/core/datacap-web/src/services/source/MangerService.ts +++ /dev/null @@ -1,174 +0,0 @@ -import {ResponseModel} from "@/model/ResponseModel"; -import TemplateSqlService from "@/services/template/TemplateSqlService"; -import {SqlBody} from "@/model/template/SqlBody"; -import {ExecuteService} from "@/services/ExecuteService"; -import {Sql} from "@/model/sql/Sql"; -import {ExecuteDslBodyBuilder} from "@/model/ExecuteDslBody"; -import {SqlBodyBuilder} from "@/model/builder/SqlBody"; -import {SqlType} from "@/model/builder/SqlType"; -import {SqlColumn, SqlColumnBuilder} from "@/model/builder/SqlColumn"; -import {SqlOrder} from "@/model/builder/SqlOrder"; - -class ManagerService -{ - getDatabases(id: number): Promise - { - const configure: SqlBody = { - configure: undefined, - sourceId: id, - templateName: 'getAllDatabase' - }; - return TemplateSqlService.execute(configure); - } - - /** - * Finds all table types under the database according to the database - * Template: FindTableTypeByDatabase - * @param id The selected data source tag, which is stored in the database - * @param database The query database name - */ - findTableTypeByDatabase(id: number, database: string): Promise - { - const configure: SqlBody = { - configure: { - database: database - }, - sourceId: id, - templateName: 'FindTableTypeByDatabase' - }; - return TemplateSqlService.execute(configure); - } - - /** - * Gets a collection of related data based on the specified database and data type - * Template: FindTableByDatabaseAndType - * @param id The selected data source tag, which is stored in the database - * @param database The query database name - * @param type The query table type - */ - getTableDataByDatabaseAndType(id: number, database: string, type: string): Promise - { - const configure: SqlBody = { - configure: { - database: database, - type: type - }, - sourceId: id, - templateName: 'FindTableByDatabaseAndType' - }; - return TemplateSqlService.execute(configure); - } - - /** - * Gets the data column classification collection based on the provided database and data table - * Template: FindColumnTypeByDatabaseAndTable - * @param id The selected data source tag, which is stored in the database - * @param database The query database name - * @param table The query table name - */ - findColumnTypeByDatabaseAndTable(id: number, database: string, table: string): Promise - { - const configure: SqlBody = { - configure: { - database: database, - table: table - }, - sourceId: id, - templateName: 'FindColumnTypeByDatabaseAndTable' - }; - return TemplateSqlService.execute(configure); - } - - /** - * Gets a collection of related data based on the specified database, table, and data type - * Template: FindColumnByDatabaseAndTableAndType - * @param id The selected data source tag, which is stored in the database - * @param database The query database name - * @param table The query table name - * @param type The query table type - */ - getColumnDataByDatabaseAndTableAndType(id: number, database: string, table: string, type: string): Promise - { - const configure: SqlBody = { - configure: { - database: database, - table: table, - type: type - }, - sourceId: id, - templateName: 'FindColumnByDatabaseAndTableAndType' - }; - return TemplateSqlService.execute(configure); - } - - getTables(id: number, database: string): Promise - { - const configure: SqlBody = { - configure: { - database: database - }, - sourceId: id, - templateName: 'getAllTablesFromDatabase' - }; - return TemplateSqlService.execute(configure); - } - - getColumns(id: number, database: string, table): Promise - { - const configure: SqlBody = { - configure: { - table: database + '.' + table - }, - sourceId: id, - templateName: 'getAllColumnsFromDatabaseAndTable' - }; - return TemplateSqlService.execute(configure); - } - - getData(id: number, database: string, table: string, page: number, size: number): Promise - { - const configure: SqlBody = { - configure: { - table: database + '.' + table, - page: page, - size: size - }, - sourceId: id, - templateName: 'getDataFromDatabaseAndTableLimited' - }; - return TemplateSqlService.execute(configure); - } - - getDataByConfigure(id: string, sql: Sql): Promise - { - const columns: SqlColumn[] = new Array(); - if (sql.columns.length > 0) { - sql.columns.forEach(column => columns.push(new SqlColumnBuilder(column).build())); - } - else { - columns.push(new SqlColumnBuilder('*').build()); - } - // The default offset is 1, and the database index defaults to 0, which needs to be subtracted by 1 - const orders: SqlColumn[] = new Array(); - if (sql.sort) { - sql.sort.forEach(order => { - orders.push(new SqlColumnBuilder(order.column).setOrder(SqlOrder[order.sort.toUpperCase()]).build()); - }); - } - - const sqlBody = new SqlBodyBuilder(sql.database, sql.table) - .setColumns(columns) - .setOrders(orders) - .setType(SqlType.SELECT) - .setLimit(sql.limit) - .setOffset(sql.offset - 1) - .setWhere(sql.where) - .build(); - const configure = new ExecuteDslBodyBuilder(id, 'JSON') - .setConfigure(sqlBody) - .build(); - return new ExecuteService().executeDsl(configure); - } -} - -export default new ManagerService(); diff --git a/core/datacap-web/src/views/admin/source/AdminSource.vue b/core/datacap-web/src/views/admin/source/AdminSource.vue index 75f35f5f..cceaca21 100644 --- a/core/datacap-web/src/views/admin/source/AdminSource.vue +++ b/core/datacap-web/src/views/admin/source/AdminSource.vue @@ -67,14 +67,6 @@ - diff --git a/core/datacap-web/src/views/admin/source/SourceManager.vue b/core/datacap-web/src/views/admin/source/SourceManager.vue index e6ac1c6b..3b1d571d 100644 --- a/core/datacap-web/src/views/admin/source/SourceManager.vue +++ b/core/datacap-web/src/views/admin/source/SourceManager.vue @@ -1,177 +1,145 @@ - - diff --git a/driver/datacap-driver-mongo/pom.xml b/driver/datacap-driver-mongo/pom.xml index f0f31322..4ad17bd3 100644 --- a/driver/datacap-driver-mongo/pom.xml +++ b/driver/datacap-driver-mongo/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/driver/datacap-driver-redis/pom.xml b/driver/datacap-driver-redis/pom.xml index 5553c63b..b27e4674 100644 --- a/driver/datacap-driver-redis/pom.xml +++ b/driver/datacap-driver-redis/pom.xml @@ -6,7 +6,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/executor/datacap-executor-example/pom.xml b/executor/datacap-executor-example/pom.xml index 0b061638..faca7340 100644 --- a/executor/datacap-executor-example/pom.xml +++ b/executor/datacap-executor-example/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml @@ -20,17 +20,4 @@ - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${plugin.maven.nexus.version} - true - - true - - - - diff --git a/executor/datacap-executor-seatunnel/pom.xml b/executor/datacap-executor-seatunnel/pom.xml index 26c3b01f..63ea7b56 100644 --- a/executor/datacap-executor-seatunnel/pom.xml +++ b/executor/datacap-executor-seatunnel/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/lib/datacap-http/pom.xml b/lib/datacap-http/pom.xml index 705cbabf..d2225e15 100644 --- a/lib/datacap-http/pom.xml +++ b/lib/datacap-http/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/lib/datacap-logger/pom.xml b/lib/datacap-logger/pom.xml index 8a24574e..ba55b9cc 100644 --- a/lib/datacap-logger/pom.xml +++ b/lib/datacap-logger/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/lib/datacap-schedule/pom.xml b/lib/datacap-schedule/pom.xml index 3b95255b..9e2f46ac 100644 --- a/lib/datacap-schedule/pom.xml +++ b/lib/datacap-schedule/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/lib/datacap-shell/pom.xml b/lib/datacap-shell/pom.xml index a0d3af16..80763a8e 100644 --- a/lib/datacap-shell/pom.xml +++ b/lib/datacap-shell/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-http-ceresdb/pom.xml b/plugin/datacap-http-ceresdb/pom.xml index 618e52eb..84dd67f8 100644 --- a/plugin/datacap-http-ceresdb/pom.xml +++ b/plugin/datacap-http-ceresdb/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-http-clickhouse/pom.xml b/plugin/datacap-http-clickhouse/pom.xml index c71344b1..9b68dabb 100644 --- a/plugin/datacap-http-clickhouse/pom.xml +++ b/plugin/datacap-http-clickhouse/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-http-cratedb/pom.xml b/plugin/datacap-http-cratedb/pom.xml index c9c94205..ce7be070 100644 --- a/plugin/datacap-http-cratedb/pom.xml +++ b/plugin/datacap-http-cratedb/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-http-greptime/pom.xml b/plugin/datacap-http-greptime/pom.xml index f1d7508b..31cedd82 100644 --- a/plugin/datacap-http-greptime/pom.xml +++ b/plugin/datacap-http-greptime/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-http-questdb/pom.xml b/plugin/datacap-http-questdb/pom.xml index 52e8908a..117eb93d 100644 --- a/plugin/datacap-http-questdb/pom.xml +++ b/plugin/datacap-http-questdb/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-jdbc-clickhouse/pom.xml b/plugin/datacap-jdbc-clickhouse/pom.xml index d228c285..595f58d2 100644 --- a/plugin/datacap-jdbc-clickhouse/pom.xml +++ b/plugin/datacap-jdbc-clickhouse/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-cratedb/pom.xml b/plugin/datacap-jdbc-cratedb/pom.xml index 6ed93160..69d65c56 100644 --- a/plugin/datacap-jdbc-cratedb/pom.xml +++ b/plugin/datacap-jdbc-cratedb/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-db2/pom.xml b/plugin/datacap-jdbc-db2/pom.xml index 329f6241..0a9635a5 100644 --- a/plugin/datacap-jdbc-db2/pom.xml +++ b/plugin/datacap-jdbc-db2/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-jdbc-dm/pom.xml b/plugin/datacap-jdbc-dm/pom.xml index f2dc483d..f4cf0920 100644 --- a/plugin/datacap-jdbc-dm/pom.xml +++ b/plugin/datacap-jdbc-dm/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-doris/pom.xml b/plugin/datacap-jdbc-doris/pom.xml index 825810b8..9224a449 100644 --- a/plugin/datacap-jdbc-doris/pom.xml +++ b/plugin/datacap-jdbc-doris/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-jdbc-dremio/pom.xml b/plugin/datacap-jdbc-dremio/pom.xml index f5dca744..c2a2f803 100644 --- a/plugin/datacap-jdbc-dremio/pom.xml +++ b/plugin/datacap-jdbc-dremio/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-druid/pom.xml b/plugin/datacap-jdbc-druid/pom.xml index 4102df28..d32d6cae 100644 --- a/plugin/datacap-jdbc-druid/pom.xml +++ b/plugin/datacap-jdbc-druid/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-duckdb/pom.xml b/plugin/datacap-jdbc-duckdb/pom.xml index 9b440958..f1facc26 100644 --- a/plugin/datacap-jdbc-duckdb/pom.xml +++ b/plugin/datacap-jdbc-duckdb/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-jdbc-elasticsearch/pom.xml b/plugin/datacap-jdbc-elasticsearch/pom.xml index e7593e66..78a5e2ba 100644 --- a/plugin/datacap-jdbc-elasticsearch/pom.xml +++ b/plugin/datacap-jdbc-elasticsearch/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-h2/pom.xml b/plugin/datacap-jdbc-h2/pom.xml index 4b0f5d2c..2cc0a95c 100644 --- a/plugin/datacap-jdbc-h2/pom.xml +++ b/plugin/datacap-jdbc-h2/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-hive/pom.xml b/plugin/datacap-jdbc-hive/pom.xml index e81af769..83d106d5 100644 --- a/plugin/datacap-jdbc-hive/pom.xml +++ b/plugin/datacap-jdbc-hive/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-hologres/pom.xml b/plugin/datacap-jdbc-hologres/pom.xml index a51dd1ea..531dcb0b 100644 --- a/plugin/datacap-jdbc-hologres/pom.xml +++ b/plugin/datacap-jdbc-hologres/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-jdbc-ignite/pom.xml b/plugin/datacap-jdbc-ignite/pom.xml index 60d3d6bf..d81c5cec 100644 --- a/plugin/datacap-jdbc-ignite/pom.xml +++ b/plugin/datacap-jdbc-ignite/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-jdbc-impala/pom.xml b/plugin/datacap-jdbc-impala/pom.xml index 5bd989b6..25ceaf4d 100644 --- a/plugin/datacap-jdbc-impala/pom.xml +++ b/plugin/datacap-jdbc-impala/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-iotdb/pom.xml b/plugin/datacap-jdbc-iotdb/pom.xml index 1d7268e1..d8c4b409 100644 --- a/plugin/datacap-jdbc-iotdb/pom.xml +++ b/plugin/datacap-jdbc-iotdb/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-jdbc-kylin/pom.xml b/plugin/datacap-jdbc-kylin/pom.xml index f75797c8..0595eb5d 100644 --- a/plugin/datacap-jdbc-kylin/pom.xml +++ b/plugin/datacap-jdbc-kylin/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-kyuubi/pom.xml b/plugin/datacap-jdbc-kyuubi/pom.xml index 0f31016a..817eb9dc 100644 --- a/plugin/datacap-jdbc-kyuubi/pom.xml +++ b/plugin/datacap-jdbc-kyuubi/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-monetdb/pom.xml b/plugin/datacap-jdbc-monetdb/pom.xml index 171a8598..319e7eac 100644 --- a/plugin/datacap-jdbc-monetdb/pom.xml +++ b/plugin/datacap-jdbc-monetdb/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-mongo/pom.xml b/plugin/datacap-jdbc-mongo/pom.xml index 67935bb3..c6f3ffcb 100644 --- a/plugin/datacap-jdbc-mongo/pom.xml +++ b/plugin/datacap-jdbc-mongo/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-mysql/pom.xml b/plugin/datacap-jdbc-mysql/pom.xml index 607926a1..45d5f46c 100644 --- a/plugin/datacap-jdbc-mysql/pom.xml +++ b/plugin/datacap-jdbc-mysql/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-neo4j/pom.xml b/plugin/datacap-jdbc-neo4j/pom.xml index f1a3ee52..64e4823d 100644 --- a/plugin/datacap-jdbc-neo4j/pom.xml +++ b/plugin/datacap-jdbc-neo4j/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-jdbc-oceanbase/pom.xml b/plugin/datacap-jdbc-oceanbase/pom.xml index 5908cb47..c734116f 100644 --- a/plugin/datacap-jdbc-oceanbase/pom.xml +++ b/plugin/datacap-jdbc-oceanbase/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-oracle/pom.xml b/plugin/datacap-jdbc-oracle/pom.xml index 0d018962..d8cfad08 100644 --- a/plugin/datacap-jdbc-oracle/pom.xml +++ b/plugin/datacap-jdbc-oracle/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-phoenix/pom.xml b/plugin/datacap-jdbc-phoenix/pom.xml index d296e335..ab69937e 100644 --- a/plugin/datacap-jdbc-phoenix/pom.xml +++ b/plugin/datacap-jdbc-phoenix/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-postgresql/pom.xml b/plugin/datacap-jdbc-postgresql/pom.xml index c5d02359..c16292a8 100644 --- a/plugin/datacap-jdbc-postgresql/pom.xml +++ b/plugin/datacap-jdbc-postgresql/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-presto/pom.xml b/plugin/datacap-jdbc-presto/pom.xml index ea83c347..ace3e5e7 100644 --- a/plugin/datacap-jdbc-presto/pom.xml +++ b/plugin/datacap-jdbc-presto/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-redis/pom.xml b/plugin/datacap-jdbc-redis/pom.xml index aca10b8a..b9d0edb7 100644 --- a/plugin/datacap-jdbc-redis/pom.xml +++ b/plugin/datacap-jdbc-redis/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-snowflake/pom.xml b/plugin/datacap-jdbc-snowflake/pom.xml index e4025ca3..95e49e10 100644 --- a/plugin/datacap-jdbc-snowflake/pom.xml +++ b/plugin/datacap-jdbc-snowflake/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-jdbc-sqlserver/pom.xml b/plugin/datacap-jdbc-sqlserver/pom.xml index 5575d933..df110a13 100644 --- a/plugin/datacap-jdbc-sqlserver/pom.xml +++ b/plugin/datacap-jdbc-sqlserver/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-starrocks/pom.xml b/plugin/datacap-jdbc-starrocks/pom.xml index afd4607c..d5e0ff9d 100644 --- a/plugin/datacap-jdbc-starrocks/pom.xml +++ b/plugin/datacap-jdbc-starrocks/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-jdbc-tdengine/pom.xml b/plugin/datacap-jdbc-tdengine/pom.xml index 2af4f249..6a08b6b8 100644 --- a/plugin/datacap-jdbc-tdengine/pom.xml +++ b/plugin/datacap-jdbc-tdengine/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-trino/pom.xml b/plugin/datacap-jdbc-trino/pom.xml index e53aea24..417e5ed0 100644 --- a/plugin/datacap-jdbc-trino/pom.xml +++ b/plugin/datacap-jdbc-trino/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-jdbc-ydb/pom.xml b/plugin/datacap-jdbc-ydb/pom.xml index bb47c4cb..ce023e1a 100644 --- a/plugin/datacap-jdbc-ydb/pom.xml +++ b/plugin/datacap-jdbc-ydb/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-native-alioss/pom.xml b/plugin/datacap-native-alioss/pom.xml index 76da5567..af9a5f2c 100644 --- a/plugin/datacap-native-alioss/pom.xml +++ b/plugin/datacap-native-alioss/pom.xml @@ -6,7 +6,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-native-h2/pom.xml b/plugin/datacap-native-h2/pom.xml index 00eb8aa2..2991add6 100644 --- a/plugin/datacap-native-h2/pom.xml +++ b/plugin/datacap-native-h2/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-native-hdfs/pom.xml b/plugin/datacap-native-hdfs/pom.xml index df2feac0..62f1e639 100644 --- a/plugin/datacap-native-hdfs/pom.xml +++ b/plugin/datacap-native-hdfs/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-native-kafka/pom.xml b/plugin/datacap-native-kafka/pom.xml index 3a043632..c2122c01 100644 --- a/plugin/datacap-native-kafka/pom.xml +++ b/plugin/datacap-native-kafka/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-native-redis/pom.xml b/plugin/datacap-native-redis/pom.xml index 42c2bfe4..ed73c6c8 100644 --- a/plugin/datacap-native-redis/pom.xml +++ b/plugin/datacap-native-redis/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-native-zookeeper/pom.xml b/plugin/datacap-native-zookeeper/pom.xml index 4f022804..dfbeff3a 100644 --- a/plugin/datacap-native-zookeeper/pom.xml +++ b/plugin/datacap-native-zookeeper/pom.xml @@ -5,7 +5,7 @@ datacap io.edurt.datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugin/datacap-plugin-cassandra/pom.xml b/plugin/datacap-plugin-cassandra/pom.xml index ac9191dc..48afa114 100644 --- a/plugin/datacap-plugin-cassandra/pom.xml +++ b/plugin/datacap-plugin-cassandra/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-plugin-mongo-community/pom.xml b/plugin/datacap-plugin-mongo-community/pom.xml index a49f321f..a1d51e01 100644 --- a/plugin/datacap-plugin-mongo-community/pom.xml +++ b/plugin/datacap-plugin-mongo-community/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/plugin/datacap-plugin-pinot/pom.xml b/plugin/datacap-plugin-pinot/pom.xml index 6137b160..ec2b5e02 100644 --- a/plugin/datacap-plugin-pinot/pom.xml +++ b/plugin/datacap-plugin-pinot/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 621e9c9c..eb9c60f8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.edurt.datacap datacap pom - 1.16.0 + 1.17.0-SNAPSHOT client/datacap-cli @@ -152,7 +152,7 @@ 3.6.0 1.6 1.6.13 - 1.8.10 + 1.9.10 1.8 diff --git a/shaded/datacap-shaded-pinot/pom.xml b/shaded/datacap-shaded-pinot/pom.xml index 84b5e763..52fe9932 100644 --- a/shaded/datacap-shaded-pinot/pom.xml +++ b/shaded/datacap-shaded-pinot/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml diff --git a/shaded/datacap-shaded-ydb/pom.xml b/shaded/datacap-shaded-ydb/pom.xml index 06bf1582..87be156c 100644 --- a/shaded/datacap-shaded-ydb/pom.xml +++ b/shaded/datacap-shaded-ydb/pom.xml @@ -6,7 +6,7 @@ io.edurt.datacap datacap - 1.16.0 + 1.17.0-SNAPSHOT ../../pom.xml