Fix datasource build assembly bug

apache · Nov 30, 2023 · bf823cb · bf823cb
1 parent 4c4db96
commit bf823cb
Show file tree

Hide file tree

Showing 49 changed files with 7 additions and 6 deletions.
diff --git a/...adata-query/service/elasticsearch/pom.xml → ...rce-manager/service/elasticsearch/pom.xml b/...adata-query/service/elasticsearch/pom.xml → ...rce-manager/service/elasticsearch/pom.xml
diff --git a/...search/src/main/assembly/distribution.xml → ...search/src/main/assembly/distribution.xml b/...search/src/main/assembly/distribution.xml → ...search/src/main/assembly/distribution.xml
diff --git a/...data/query/service/ElasticConnection.java → ...data/query/service/ElasticConnection.java b/...data/query/service/ElasticConnection.java → ...data/query/service/ElasticConnection.java
diff --git a/...ta/query/service/ElasticParamsMapper.java → ...ta/query/service/ElasticParamsMapper.java b/...ta/query/service/ElasticParamsMapper.java → ...ta/query/service/ElasticParamsMapper.java
diff --git a/...metadata/query/service/EsMetaService.java → ...metadata/query/service/EsMetaService.java b/...metadata/query/service/EsMetaService.java → ...metadata/query/service/EsMetaService.java
diff --git a/...inkis-metadata-query/service/hdfs/pom.xml → ...s-datasource-manager/service/hdfs/pom.xml b/...inkis-metadata-query/service/hdfs/pom.xml → ...s-datasource-manager/service/hdfs/pom.xml
diff --git a/...e/hdfs/src/main/assembly/distribution.xml → ...e/hdfs/src/main/assembly/distribution.xml b/...e/hdfs/src/main/assembly/distribution.xml → ...e/hdfs/src/main/assembly/distribution.xml
diff --git a/...etadata/query/service/HdfsConnection.java → ...etadata/query/service/HdfsConnection.java b/...etadata/query/service/HdfsConnection.java → ...etadata/query/service/HdfsConnection.java
diff --git a/...tadata/query/service/HdfsMetaService.java → ...tadata/query/service/HdfsMetaService.java b/...tadata/query/service/HdfsMetaService.java → ...tadata/query/service/HdfsMetaService.java
diff --git a/...adata/query/service/HdfsParamsMapper.java → ...adata/query/service/HdfsParamsMapper.java b/...adata/query/service/HdfsParamsMapper.java → ...adata/query/service/HdfsParamsMapper.java
diff --git a/...uery/service/conf/ConfigurationUtils.java → ...uery/service/conf/ConfigurationUtils.java b/...uery/service/conf/ConfigurationUtils.java → ...uery/service/conf/ConfigurationUtils.java
diff --git a/...inkis-metadata-query/service/hive/pom.xml → ...s-datasource-manager/service/hive/pom.xml b/...inkis-metadata-query/service/hive/pom.xml → ...s-datasource-manager/service/hive/pom.xml
diff --git a/...e/hive/src/main/assembly/distribution.xml → ...e/hive/src/main/assembly/distribution.xml b/...e/hive/src/main/assembly/distribution.xml → ...e/hive/src/main/assembly/distribution.xml
diff --git a/...etadata/query/service/HiveConnection.java → ...etadata/query/service/HiveConnection.java b/...etadata/query/service/HiveConnection.java → ...etadata/query/service/HiveConnection.java
diff --git a/...tadata/query/service/HiveMetaService.java → ...tadata/query/service/HiveMetaService.java b/...tadata/query/service/HiveMetaService.java → ...tadata/query/service/HiveMetaService.java
diff --git a/...adata/query/service/HiveParamsMapper.java → ...adata/query/service/HiveParamsMapper.java b/...adata/query/service/HiveParamsMapper.java → ...adata/query/service/HiveParamsMapper.java
diff --git a/...inkis-metadata-query/service/jdbc/pom.xml → ...s-datasource-manager/service/jdbc/pom.xml b/...inkis-metadata-query/service/jdbc/pom.xml → ...s-datasource-manager/service/jdbc/pom.xml
diff --git a/...e/jdbc/src/main/assembly/distribution.xml → ...e/jdbc/src/main/assembly/distribution.xml b/...e/jdbc/src/main/assembly/distribution.xml → ...e/jdbc/src/main/assembly/distribution.xml
diff --git a/.../query/service/AbstractSqlConnection.java → .../query/service/AbstractSqlConnection.java b/.../query/service/AbstractSqlConnection.java → .../query/service/AbstractSqlConnection.java
diff --git a/.../query/service/ClickhouseMetaService.java → .../query/service/ClickhouseMetaService.java b/.../query/service/ClickhouseMetaService.java → .../query/service/ClickhouseMetaService.java
diff --git a/...etadata/query/service/Db2MetaService.java → ...etadata/query/service/Db2MetaService.java b/...etadata/query/service/Db2MetaService.java → ...etadata/query/service/Db2MetaService.java
diff --git a/...metadata/query/service/DmMetaService.java → ...metadata/query/service/DmMetaService.java b/...metadata/query/service/DmMetaService.java → ...metadata/query/service/DmMetaService.java
diff --git a/...a/query/service/GreenplumMetaService.java → ...a/query/service/GreenplumMetaService.java b/...a/query/service/GreenplumMetaService.java → ...a/query/service/GreenplumMetaService.java
diff --git a/...ta/query/service/KingbaseMetaService.java → ...ta/query/service/KingbaseMetaService.java b/...ta/query/service/KingbaseMetaService.java → ...ta/query/service/KingbaseMetaService.java
diff --git a/...adata/query/service/MysqlMetaService.java → ...adata/query/service/MysqlMetaService.java b/...adata/query/service/MysqlMetaService.java → ...adata/query/service/MysqlMetaService.java
diff --git a/...data/query/service/OracleMetaService.java → ...data/query/service/OracleMetaService.java b/...data/query/service/OracleMetaService.java → ...data/query/service/OracleMetaService.java
diff --git a/.../query/service/PostgresqlMetaService.java → .../query/service/PostgresqlMetaService.java b/.../query/service/PostgresqlMetaService.java → .../query/service/PostgresqlMetaService.java
diff --git a/...a/query/service/SqlserverMetaService.java → ...a/query/service/SqlserverMetaService.java b/...a/query/service/SqlserverMetaService.java → ...a/query/service/SqlserverMetaService.java
diff --git a/...ery/service/clickhouse/SqlConnection.java → ...ery/service/clickhouse/SqlConnection.java b/...ery/service/clickhouse/SqlConnection.java → ...ery/service/clickhouse/SqlConnection.java
diff --git a/...a/query/service/conf/SqlParamsMapper.java → ...a/query/service/conf/SqlParamsMapper.java b/...a/query/service/conf/SqlParamsMapper.java → ...a/query/service/conf/SqlParamsMapper.java
diff --git a/...data/query/service/db2/SqlConnection.java → ...data/query/service/db2/SqlConnection.java b/...data/query/service/db2/SqlConnection.java → ...data/query/service/db2/SqlConnection.java
diff --git a/...adata/query/service/dm/SqlConnection.java → ...adata/query/service/dm/SqlConnection.java b/...adata/query/service/dm/SqlConnection.java → ...adata/query/service/dm/SqlConnection.java
diff --git a/...uery/service/greenplum/SqlConnection.java → ...uery/service/greenplum/SqlConnection.java b/...uery/service/greenplum/SqlConnection.java → ...uery/service/greenplum/SqlConnection.java
diff --git a/...query/service/kingbase/SqlConnection.java → ...query/service/kingbase/SqlConnection.java b/...query/service/kingbase/SqlConnection.java → ...query/service/kingbase/SqlConnection.java
diff --git a/...ta/query/service/mysql/SqlConnection.java → ...ta/query/service/mysql/SqlConnection.java b/...ta/query/service/mysql/SqlConnection.java → ...ta/query/service/mysql/SqlConnection.java
diff --git a/...a/query/service/oracle/SqlConnection.java → ...a/query/service/oracle/SqlConnection.java b/...a/query/service/oracle/SqlConnection.java → ...a/query/service/oracle/SqlConnection.java
diff --git a/...query/service/postgres/SqlConnection.java → ...query/service/postgres/SqlConnection.java b/...query/service/postgres/SqlConnection.java → ...query/service/postgres/SqlConnection.java
diff --git a/...uery/service/sqlserver/SqlConnection.java → ...uery/service/sqlserver/SqlConnection.java b/...uery/service/sqlserver/SqlConnection.java → ...uery/service/sqlserver/SqlConnection.java
diff --git a/...nkis-metadata-query/service/kafka/pom.xml → ...-datasource-manager/service/kafka/pom.xml b/...nkis-metadata-query/service/kafka/pom.xml → ...-datasource-manager/service/kafka/pom.xml
diff --git a/.../kafka/src/main/assembly/distribution.xml → .../kafka/src/main/assembly/distribution.xml b/.../kafka/src/main/assembly/distribution.xml → .../kafka/src/main/assembly/distribution.xml
diff --git a/...tadata/query/service/KafkaConnection.java → ...tadata/query/service/KafkaConnection.java b/...tadata/query/service/KafkaConnection.java → ...tadata/query/service/KafkaConnection.java
diff --git a/...adata/query/service/KafkaMetaService.java → ...adata/query/service/KafkaMetaService.java b/...adata/query/service/KafkaMetaService.java → ...adata/query/service/KafkaMetaService.java
diff --git a/...data/query/service/KafkaParamsMapper.java → ...data/query/service/KafkaParamsMapper.java b/...data/query/service/KafkaParamsMapper.java → ...data/query/service/KafkaParamsMapper.java
diff --git a/...is-metadata-query/service/mongodb/pom.xml → ...atasource-manager/service/mongodb/pom.xml b/...is-metadata-query/service/mongodb/pom.xml → ...atasource-manager/service/mongodb/pom.xml
diff --git a/...ongodb/src/main/assembly/distribution.xml → ...ongodb/src/main/assembly/distribution.xml b/...ongodb/src/main/assembly/distribution.xml → ...ongodb/src/main/assembly/distribution.xml
diff --git a/...data/query/service/MongoDbConnection.java → ...data/query/service/MongoDbConnection.java b/...data/query/service/MongoDbConnection.java → ...data/query/service/MongoDbConnection.java
diff --git a/...ta/query/service/MongoDbParamsMapper.java → ...ta/query/service/MongoDbParamsMapper.java b/...ta/query/service/MongoDbParamsMapper.java → ...ta/query/service/MongoDbParamsMapper.java
diff --git a/...ata/query/service/MongodbMetaService.java → ...ata/query/service/MongodbMetaService.java b/...ata/query/service/MongodbMetaService.java → ...ata/query/service/MongodbMetaService.java
diff --git 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>