This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 5e50196f2 merge datasource module (#4847)
5e50196f2 is described below
commit 5e50196f2be161c420ee6b20a4d38719c7d9935e
Author: GuoPhilipse <[email protected]>
AuthorDate: Fri Aug 4 16:17:16 2023 +0800
merge datasource module (#4847)
---
.../linkis-datasource-manager/server/pom.xml | 4 +
.../server/src/main/assembly/distribution.xml | 69 ++++++++++++-
.../server/LinkisMetadataQueryApplication.java | 0
.../server/loader/MetaClassLoaderManager.java | 0
.../query/server/restful/MetadataCoreRestful.java | 0
.../query/server/restful/MetadataQueryRestful.java | 0
.../query/server/service/MetadataQueryService.java | 0
.../service/impl/MetadataQueryServiceImpl.java | 0
.../metadata/query/server/utils/MetadataUtils.java | 0
.../query/server/receiver/BaseMetaReceiver.scala | 0
.../query/server/WebApplicationServer.java | 0
.../server/loader/MetaClassLoaderManagerTest.java | 0
.../server/receiver/BaseMetaReceiverTest.java | 0
.../server/restful/MetadataCoreRestfulTest.java | 0
.../server/restful/MetadataQueryRestfulTest.java | 0
.../metadata/query/server/restful/MvcUtils.java | 0
.../query/common/domain/GenerateSqlInfo.java | 0
.../linkis-metadata-query/server/pom.xml | 93 -----------------
.../server/src/main/assembly/distribution.xml | 112 ---------------------
.../src/test/resources/application.properties | 19 ----
.../query/service/AbstractSqlConnection.java | 0
.../linkis-datasource/pom.xml | 1 -
linkis-public-enhancements/pom.xml | 2 +-
23 files changed, 73 insertions(+), 227 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
index 876419156..0d09923dc 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
@@ -101,6 +101,10 @@
<build>
<plugins>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
index ec03bb0f0..8ff2fa8b5 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
@@ -183,6 +183,73 @@
</excludes>
</dependencySet>
</dependencySets>
-
+ <fileSets>
+ <fileSet>
+
<directory>${basedir}/../service/elasticsearch/target/out/lib</directory>
+ <fileMode>0755</fileMode>
+ <outputDirectory>lib/service/elasticsearch</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*-javadoc.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../service/hive/target/out/lib</directory>
+ <fileMode>0755</fileMode>
+ <outputDirectory>lib/service/hive</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*-javadoc.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../service/kafka/target/out/lib</directory>
+ <fileMode>0755</fileMode>
+ <outputDirectory>lib/service/kafka</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*-javadoc.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../service/jdbc/target/out/lib</directory>
+ <fileMode>0755</fileMode>
+ <outputDirectory>lib/service/jdbc</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*-javadoc.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../service/hdfs/target/out/lib</directory>
+ <fileMode>0755</fileMode>
+ <outputDirectory>lib/service/hdfs</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*-javadoc.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../service/mongodb/target/out/lib</directory>
+ <fileMode>0755</fileMode>
+ <outputDirectory>lib/service/mongodb</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*-javadoc.jar</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
</assembly>
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManagerTest.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManagerTest.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManagerTest.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManagerTest.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiverTest.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiverTest.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiverTest.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiverTest.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.java
similarity index 100%
rename from
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.java
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.java
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.java
old mode 100755
new mode 100644
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
deleted file mode 100644
index 21705e23f..000000000
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis</artifactId>
- <version>${revision}</version>
- <relativePath>../../../../pom.xml</relativePath>
- </parent>
- <artifactId>linkis-metadata-query-server</artifactId>
-
- <dependencies>
- <!--Metadata common-->
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-metadata-query-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- data source manager common dependency-->
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-datasource-manager-common</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!--rpc-->
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-rpc</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <skipAssembly>false</skipAssembly>
- <finalName>out</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <attach>false</attach>
- <descriptors>
- <descriptor>src/main/assembly/distribution.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/distribution.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml
deleted file mode 100644
index e0d152d64..000000000
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1
https://maven.apache.org/xsd/assembly-2.1.1.xsd";>
- <id>linkis-metadata-query-server</id>
- <formats>
- <format>zip</format>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <baseDirectory>linkis-mdm-server</baseDirectory>
-
- <dependencySets>
- <dependencySet>
- <!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
- <!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>lib</outputDirectory>
- <useProjectArtifact>true</useProjectArtifact>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <unpack>false</unpack>
- <useStrictFiltering>false</useStrictFiltering>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- </dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
-
<directory>${basedir}/../service/elasticsearch/target/out/lib</directory>
- <fileMode>0755</fileMode>
- <outputDirectory>lib/service/elasticsearch</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>*-javadoc.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../service/hive/target/out/lib</directory>
- <fileMode>0755</fileMode>
- <outputDirectory>lib/service/hive</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>*-javadoc.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../service/kafka/target/out/lib</directory>
- <fileMode>0755</fileMode>
- <outputDirectory>lib/service/kafka</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>*-javadoc.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../service/jdbc/target/out/lib</directory>
- <fileMode>0755</fileMode>
- <outputDirectory>lib/service/jdbc</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>*-javadoc.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../service/hdfs/target/out/lib</directory>
- <fileMode>0755</fileMode>
- <outputDirectory>lib/service/hdfs</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>*-javadoc.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../service/mongodb/target/out/lib</directory>
- <fileMode>0755</fileMode>
- <outputDirectory>lib/service/mongodb</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>*-javadoc.jar</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
-</assembly>
-
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/resources/application.properties
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/resources/application.properties
deleted file mode 100644
index 5572769a6..000000000
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/resources/application.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#disable eureka discovery client
-spring.cloud.service-registry.auto-registration.enabled=false
-eureka.client.enabled=false
-eureka.client.serviceUrl.registerWithEureka=false
\ No newline at end of file
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-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java
old mode 100755
new mode 100644
diff --git a/linkis-public-enhancements/linkis-datasource/pom.xml
b/linkis-public-enhancements/linkis-datasource/pom.xml
index a6a138f67..19f68d677 100644
--- a/linkis-public-enhancements/linkis-datasource/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/pom.xml
@@ -36,7 +36,6 @@
<module>linkis-metadata-query/service/jdbc</module>
<module>linkis-metadata-query/service/hdfs</module>
<module>linkis-metadata-query/service/mongodb</module>
- <module>linkis-metadata-query/server</module>
<module>linkis-datasource-client</module>
</modules>
</project>
diff --git a/linkis-public-enhancements/pom.xml
b/linkis-public-enhancements/pom.xml
index c3eb423cf..db9e993c2 100644
--- a/linkis-public-enhancements/pom.xml
+++ b/linkis-public-enhancements/pom.xml
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
- <artifactId>linkis-metadata-query-server</artifactId>
+ <artifactId>linkis-datasource-manager-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
