You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by al...@apache.org on 2023/12/01 08:13:02 UTC
(linkis) 04/06: Fix datasource build assembly bug
This is an automated email from the ASF dual-hosted git repository.
alexkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
commit 9fd12658028fa23178a0775ba8ac8c16ee17c9ad
Author: peacewong <wp...@gmail.com>
AuthorDate: Thu Nov 30 17:31:24 2023 +0800
Fix datasource build assembly bug
---
.../service/elasticsearch/pom.xml | 0
.../elasticsearch/src/main/assembly/distribution.xml | 0
.../linkis/metadata/query/service/ElasticConnection.java | 0
.../linkis/metadata/query/service/ElasticParamsMapper.java | 0
.../apache/linkis/metadata/query/service/EsMetaService.java | 0
.../service/hdfs/pom.xml | 0
.../service/hdfs/src/main/assembly/distribution.xml | 0
.../linkis/metadata/query/service/HdfsConnection.java | 0
.../linkis/metadata/query/service/HdfsMetaService.java | 0
.../linkis/metadata/query/service/HdfsParamsMapper.java | 0
.../metadata/query/service/conf/ConfigurationUtils.java | 0
.../service/hive/pom.xml | 0
.../service/hive/src/main/assembly/distribution.xml | 0
.../linkis/metadata/query/service/HiveConnection.java | 0
.../linkis/metadata/query/service/HiveMetaService.java | 0
.../linkis/metadata/query/service/HiveParamsMapper.java | 0
.../service/jdbc/pom.xml | 0
.../service/jdbc/src/main/assembly/distribution.xml | 0
.../metadata/query/service/AbstractSqlConnection.java | 0
.../metadata/query/service/ClickhouseMetaService.java | 0
.../linkis/metadata/query/service/Db2MetaService.java | 0
.../apache/linkis/metadata/query/service/DmMetaService.java | 0
.../linkis/metadata/query/service/GreenplumMetaService.java | 0
.../linkis/metadata/query/service/KingbaseMetaService.java | 0
.../linkis/metadata/query/service/MysqlMetaService.java | 0
.../linkis/metadata/query/service/OracleMetaService.java | 0
.../metadata/query/service/PostgresqlMetaService.java | 0
.../linkis/metadata/query/service/SqlserverMetaService.java | 0
.../metadata/query/service/clickhouse/SqlConnection.java | 0
.../linkis/metadata/query/service/conf/SqlParamsMapper.java | 0
.../linkis/metadata/query/service/db2/SqlConnection.java | 0
.../linkis/metadata/query/service/dm/SqlConnection.java | 0
.../metadata/query/service/greenplum/SqlConnection.java | 0
.../metadata/query/service/kingbase/SqlConnection.java | 0
.../linkis/metadata/query/service/mysql/SqlConnection.java | 0
.../linkis/metadata/query/service/oracle/SqlConnection.java | 0
.../metadata/query/service/postgres/SqlConnection.java | 0
.../metadata/query/service/sqlserver/SqlConnection.java | 0
.../service/kafka/pom.xml | 0
.../service/kafka/src/main/assembly/distribution.xml | 0
.../linkis/metadata/query/service/KafkaConnection.java | 0
.../linkis/metadata/query/service/KafkaMetaService.java | 0
.../linkis/metadata/query/service/KafkaParamsMapper.java | 0
.../service/mongodb/pom.xml | 0
.../service/mongodb/src/main/assembly/distribution.xml | 0
.../linkis/metadata/query/service/MongoDbConnection.java | 0
.../linkis/metadata/query/service/MongoDbParamsMapper.java | 0
.../linkis/metadata/query/service/MongodbMetaService.java | 0
linkis-public-enhancements/linkis-datasource/pom.xml | 13 +++++++------
49 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/elasticsearch/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/elasticsearch/pom.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/elasticsearch/src/main/assembly/distribution.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/elasticsearch/src/main/assembly/distribution.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/ElasticConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/ElasticConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/ElasticConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/ElasticConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/ElasticParamsMapper.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/ElasticParamsMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/ElasticParamsMapper.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/ElasticParamsMapper.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/EsMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/EsMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/EsMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadata/query/service/EsMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/pom.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/src/main/assembly/distribution.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/src/main/assembly/distribution.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsParamsMapper.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsParamsMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsParamsMapper.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/HdfsParamsMapper.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/conf/ConfigurationUtils.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/conf/ConfigurationUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/conf/ConfigurationUtils.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hdfs/src/main/java/org/apache/linkis/metadata/query/service/conf/ConfigurationUtils.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/pom.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/assembly/distribution.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/assembly/distribution.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveParamsMapper.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveParamsMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveParamsMapper.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/java/org/apache/linkis/metadata/query/service/HiveParamsMapper.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/pom.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/assembly/distribution.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/assembly/distribution.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/ClickhouseMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/ClickhouseMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/ClickhouseMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/ClickhouseMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/Db2MetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/Db2MetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/Db2MetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/Db2MetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DmMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DmMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DmMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DmMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/GreenplumMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/GreenplumMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/GreenplumMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/GreenplumMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/KingbaseMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/KingbaseMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/KingbaseMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/KingbaseMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/MysqlMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/MysqlMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/MysqlMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/MysqlMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/PostgresqlMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/PostgresqlMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/PostgresqlMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/PostgresqlMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/SqlserverMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/SqlserverMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/SqlserverMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/SqlserverMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/clickhouse/SqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/clickhouse/SqlConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/clickhouse/SqlConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/clickhouse/SqlConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/conf/SqlParamsMapper.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/conf/SqlParamsMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/conf/SqlParamsMapper.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/conf/SqlParamsMapper.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/dm/SqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/dm/SqlConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/dm/SqlConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/dm/SqlConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/greenplum/SqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/greenplum/SqlConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/greenplum/SqlConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/greenplum/SqlConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/kingbase/SqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/kingbase/SqlConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/kingbase/SqlConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/kingbase/SqlConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/mysql/SqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/mysql/SqlConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/mysql/SqlConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/mysql/SqlConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/oracle/SqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/oracle/SqlConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/oracle/SqlConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/oracle/SqlConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/postgres/SqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/postgres/SqlConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/postgres/SqlConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/postgres/SqlConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/sqlserver/SqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/sqlserver/SqlConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/sqlserver/SqlConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/sqlserver/SqlConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/pom.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/src/main/assembly/distribution.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/src/main/assembly/distribution.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaParamsMapper.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaParamsMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaParamsMapper.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/src/main/java/org/apache/linkis/metadata/query/service/KafkaParamsMapper.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/pom.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/assembly/distribution.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/assembly/distribution.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbParamsMapper.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbParamsMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbParamsMapper.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbParamsMapper.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongodbMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongodbMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongodbMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongodbMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/pom.xml b/linkis-public-enhancements/linkis-datasource/pom.xml
index c7d700a13..b0eae4131 100644
--- a/linkis-public-enhancements/linkis-datasource/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/pom.xml
@@ -28,11 +28,12 @@
<packaging>pom</packaging>
<modules>
<module>linkis-datasource-manager/server</module>
- <module>linkis-metadata-query/service/elasticsearch</module>
- <module>linkis-metadata-query/service/hive</module>
- <module>linkis-metadata-query/service/kafka</module>
- <module>linkis-metadata-query/service/jdbc</module>
- <module>linkis-metadata-query/service/hdfs</module>
- <module>linkis-metadata-query/service/mongodb</module>
+ <module>linkis-datasource-manager/service/elasticsearch</module>
+ <module>linkis-datasource-manager/service/hive</module>
+ <module>linkis-datasource-manager/service/kafka</module>
+ <module>linkis-datasource-manager/service/jdbc</module>
+ <module>linkis-datasource-manager/service/hdfs</module>
+ <module>linkis-datasource-manager/service/mongodb</module>
+ <module>linkis-metadata</module>
</modules>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org