You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/01/12 03:53:19 UTC
[linkis] branch dev-1.3.2 updated: feat(mybatis): move mapper file to resources/mapper/common dir (#4091)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 23a9c65fc feat(mybatis): move mapper file to resources/mapper/common dir (#4091)
23a9c65fc is described below
commit 23a9c65fc24bd20db72840a34bea891deb9ef7ef
Author: Jack Xu <xu...@126.com>
AuthorDate: Thu Jan 12 11:53:12 2023 +0800
feat(mybatis): move mapper file to resources/mapper/common dir (#4091)
* feat(mybatis): move mapper file to resources/mapper/common file
* refactor: remove useless test code
---
linkis-commons/linkis-common/pom.xml | 15 -------
linkis-commons/linkis-hadoop-common/pom.xml | 15 -------
linkis-commons/linkis-httpclient/pom.xml | 15 -------
linkis-commons/linkis-module/pom.xml | 15 -------
linkis-commons/linkis-mybatis/pom.xml | 20 +--------
linkis-commons/linkis-protocol/pom.xml | 15 -------
linkis-commons/linkis-rpc/pom.xml | 16 --------
linkis-commons/linkis-scheduler/pom.xml | 15 -------
linkis-commons/linkis-storage/pom.xml | 9 -----
.../linkis-cli/linkis-cli-application/pom.xml | 3 +-
.../linkis-cli/linkis-cli-common/pom.xml | 5 ---
.../linkis-cli/linkis-cli-core/pom.xml | 5 ---
.../linkis-computation-client/pom.xml | 25 +-----------
.../linkis-computation-governance-common/pom.xml | 16 --------
.../linkis-engineconn-linux-launch/pom.xml | 22 ----------
.../linkis-engineconn-manager-core/pom.xml | 22 ----------
.../linkis-engineconn-manager-server/pom.xml | 20 ---------
.../linkis-once-engineconn/pom.xml | 22 ----------
.../linkis-streaming-engineconn/pom.xml | 32 ---------------
.../linkis-computation-engineconn/pom.xml | 22 ----------
.../linkis-engineconn-common/pom.xml | 22 ----------
.../linkis-engineconn-core/pom.xml | 22 ----------
.../accessible-executor/pom.xml | 22 ----------
.../executor-core/pom.xml | 22 ----------
.../linkis-engineconn-plugin-core/pom.xml | 22 ----------
.../linkis-entrance/pom.xml | 16 +-------
.../linkis/entrance/interceptor/impl/Explain.scala | 5 ++-
.../linkis-jdbc-driver/pom.xml | 32 +--------------
.../linkis-application-manager/pom.xml | 26 ------------
.../mapper/common}/EngineConnBmlResourceMapper.xml | 0
.../common}/ExternalResourceProviderDaoImpl.xml | 0
.../linkis-manager/linkis-label-common/pom.xml | 16 --------
.../linkis-manager/linkis-manager-common/pom.xml | 22 ----------
.../linkis-manager-persistence/pom.xml | 23 +----------
.../mapper/common}/ECResourceRecordMapper.xml | 0
.../mapper/common}/LabelManagerMapper.xml | 0
.../mapper/common}/LockManagerMapper.xml | 0
.../mapper/common}/NodeManagerMapper.xml | 0
.../mapper/common}/NodeMetricManagerMapper.xml | 0
.../mapper/common}/ResourceManagerMapper.xml | 0
.../src/test/resources/application.properties | 2 +-
.../conf/linkis-cg-linkismanager.properties | 2 +-
.../package/conf/linkis-mg-gateway.properties | 2 +-
.../conf/linkis-ps-publicservice.properties | 2 +-
linkis-engineconn-plugins/elasticsearch/pom.xml | 20 +--------
linkis-engineconn-plugins/flink/pom.xml | 27 +------------
linkis-engineconn-plugins/hive/pom.xml | 26 +-----------
linkis-engineconn-plugins/io_file/pom.xml | 27 +------------
linkis-engineconn-plugins/jdbc/pom.xml | 21 +---------
linkis-engineconn-plugins/openlookeng/pom.xml | 21 +---------
linkis-engineconn-plugins/pipeline/pom.xml | 27 +------------
linkis-engineconn-plugins/presto/pom.xml | 21 +---------
linkis-engineconn-plugins/python/pom.xml | 26 +-----------
.../python/src/main/resources/log4j2.xml | 2 +-
linkis-engineconn-plugins/seatunnel/pom.xml | 26 +-----------
linkis-engineconn-plugins/shell/pom.xml | 27 +------------
linkis-engineconn-plugins/spark/pom.xml | 27 +------------
.../spark/src/main/resources/log4j2.xml | 2 +-
linkis-engineconn-plugins/sqoop/pom.xml | 26 +-----------
linkis-engineconn-plugins/trino/pom.xml | 20 +--------
linkis-extensions/linkis-io-file-client/pom.xml | 9 -----
.../linkis-code-orchestrator/pom.xml | 23 -----------
.../linkis-computation-orchestrator/pom.xml | 23 -----------
.../linkis-orchestrator-core/pom.xml | 23 -----------
.../linkis-basedata-manager/pom.xml | 21 +---------
.../src/main/assembly/distribution.xml | 12 ------
.../mapper/common}/CgManagerLabelMapper.xml | 0
.../common}/ConfigurationConfigKeyMapper.xml | 0
.../common}/ConfigurationConfigValueMapper.xml | 0
.../ConfigurationKeyEngineRelationMapper.xml | 0
.../mapper/common}/DatasourceAccessMapper.xml | 0
.../mapper/common}/DatasourceEnvMapper.xml | 0
.../mapper/common}/DatasourceTypeKeyMapper.xml | 0
.../mapper/common}/DatasourceTypeMapper.xml | 0
.../mapper/common}/GatewayAuthTokenMapper.xml | 0
.../mapper/common}/PsErrorCodeMapper.xml | 0
.../common}/RmExternalResourceProviderMapper.xml | 0
.../mapper/common}/UdfManagerMapper.xml | 0
.../mapper/common}/UdfTreeMapper.xml | 0
.../linkis-bml/linkis-bml-client/pom.xml | 14 -------
.../linkis-bml/linkis-bml-common/pom.xml | 9 -----
.../linkis-bml/linkis-bml-server/pom.xml | 27 +------------
.../src/main/assembly/distribution.xml | 19 ---------
.../mapper/common}/BmlProjectMapper.xml | 0
.../mapper/common}/DownloadMapper.xml | 0
.../mapper/common}/ResourceMapper.xml | 0
.../mapper/common}/TaskMapper.xml | 0
.../mapper/common}/VersionMapper.xml | 0
.../src/test/resources/application.properties | 2 +-
.../linkis-configuration/pom.xml | 28 -------------
.../mapper/common}/ConfigMapper.xml | 0
.../mapper/common}/LabelMapper.xml | 0
.../mapper/common}/UserIpMapper.xml | 0
.../mapper/common}/UserTenantMapper.xml | 0
.../linkis/configuration/dao/LabelMapperTest.java | 15 -------
.../restful/api/ConfigurationRestfulApiTest.java | 18 +--------
.../src/test/resources/application.properties | 2 +-
.../linkis-cs-client/pom.xml | 13 ------
.../linkis-cs-common/pom.xml | 23 -----------
.../linkis-cs-listener/pom.xml | 23 -----------
.../linkis-cs-server/pom.xml | 26 ------------
.../src/main/assembly/distribution.xml | 28 -------------
.../mapper/common}/contextHistoryMapper.xml | 0
.../mapper/common}/contextIDListenerMapper.xml | 0
.../mapper/common}/contextIDMapper.xml | 0
.../mapper/common}/contextKeyListenerMapper.xml | 0
.../mapper/common}/contextMapMapper.xml | 0
.../src/test/resources/application.properties | 2 +-
.../linkis-datasource-client/pom.xml | 23 -----------
.../linkis-datasource-manager/common/pom.xml | 20 ---------
.../linkis-datasource-manager/server/pom.xml | 26 +-----------
.../server/src/main/assembly/distribution.xml | 12 ------
.../mapper/common}/DataSouceMapper.xml | 0
.../mapper/common}/DataSourceEnvMapper.xml | 0
.../mapper/common}/DataSourceParamKeyMapper.xml | 0
.../mapper/common}/DataSourceTypeMapper.xml | 0
.../mapper/common}/DataSourceVersionMapper.xml | 0
.../src/test/resources/application.properties | 2 +-
.../linkis-metadata-query/common/pom.xml | 19 ---------
.../linkis-metadata-query/server/pom.xml | 16 +-------
.../service/elasticsearch/pom.xml | 20 ---------
.../src/main/assembly/distribution.xml | 12 ------
.../linkis-metadata-query/service/hdfs/pom.xml | 23 -----------
.../hdfs/src/main/assembly/distribution.xml | 12 ------
.../linkis-metadata-query/service/hive/pom.xml | 37 -----------------
.../hive/src/main/assembly/distribution.xml | 12 ------
.../linkis-metadata-query/service/jdbc/pom.xml | 27 -------------
.../jdbc/src/main/assembly/distribution.xml | 12 ------
.../linkis-metadata-query/service/kafka/pom.xml | 40 ------------------
.../kafka/src/main/assembly/distribution.xml | 12 ------
.../linkis-metadata-query/service/mongodb/pom.xml | 25 ------------
.../mongodb/src/main/assembly/distribution.xml | 12 ------
.../linkis-datasource/linkis-metadata/pom.xml | 28 +------------
.../src/main/assembly/distribution.xml | 47 ----------------------
.../mapper/common}/HiveMetaDao.xml | 0
.../impl => resources/mapper/common}/MdqDao.xml | 0
.../src/test/resources/application.properties | 2 +-
.../linkis-error-code-client/pom.xml | 9 -----
.../linkis-error-code-common/pom.xml | 9 -----
.../linkis-error-code-server/pom.xml | 36 -----------------
.../mapper/common}/ErrorCodeMapper.xml | 0
.../src/test/resources/application.properties | 2 +-
.../linkis-instance-label-client/pom.xml | 25 ------------
.../linkis-instance-label-server/pom.xml | 25 ------------
.../mapper/common}/InsLabelRelationMapper.xml | 0
.../mapper/common}/InstanceInfoMapper.xml | 0
.../mapper/common}/InstanceLabelMapper.xml | 0
.../src/test/resources/application.properties | 2 +-
.../linkis-jobhistory/pom.xml | 25 ------------
.../mapper/common}/JobDetailMapper.xml | 0
.../mapper/common}/JobHistoryMapper.xml | 0
.../src/test/resources/application.properties | 2 +-
.../linkis-ps-common-lock/pom.xml | 26 ------------
.../mapper/common}/CommonLockMapper.xml | 0
.../src/test/resources/application.properties | 2 +-
.../linkis-storage-script-dev-client/pom.xml | 9 -----
.../linkis-storage-script-dev-server/pom.xml | 26 ------------
.../src/main/resources/application.yml | 47 ----------------------
.../src/test/resources/application.properties | 2 +-
.../linkis-udf/linkis-udf-client/pom.xml | 33 ---------------
.../linkis-udf/linkis-udf-common/pom.xml | 33 ---------------
.../impl => resources/mapper/common}/UDFDao.xml | 0
.../mapper/common}/UDFTreeDao.xml | 0
.../mapper/common}/UDFVersionDao.xml | 0
.../src/test/resources/application.properties | 2 +-
linkis-public-enhancements/linkis-variable/pom.xml | 25 ------------
.../impl => resources/mapper/common}/VarMapper.xml | 0
.../src/test/resources/application.properties | 2 +-
linkis-public-enhancements/pom.xml | 23 -----------
.../linkis-service-discovery/linkis-eureka/pom.xml | 20 ---------
.../linkis-gateway-authentication/pom.xml | 36 -----------------
.../mapper/common}/TokenMapper.xml | 0
.../src/test/resources/application.properties | 2 +-
.../linkis-gateway-core/pom.xml | 24 +----------
.../linkis-gateway-httpclient-support/pom.xml | 15 -------
.../linkis-gateway-server-support/pom.xml | 33 +--------------
.../linkis-spring-cloud-gateway/pom.xml | 17 --------
177 files changed, 53 insertions(+), 2191 deletions(-)
diff --git a/linkis-commons/linkis-common/pom.xml b/linkis-commons/linkis-common/pom.xml
index 6d98a220f..e8f4ce536 100644
--- a/linkis-commons/linkis-common/pom.xml
+++ b/linkis-commons/linkis-common/pom.xml
@@ -156,26 +156,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-commons/linkis-hadoop-common/pom.xml b/linkis-commons/linkis-hadoop-common/pom.xml
index 638b33762..3594cbacc 100644
--- a/linkis-commons/linkis-hadoop-common/pom.xml
+++ b/linkis-commons/linkis-hadoop-common/pom.xml
@@ -74,26 +74,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
diff --git a/linkis-commons/linkis-httpclient/pom.xml b/linkis-commons/linkis-httpclient/pom.xml
index bd95fed8a..473b591a0 100644
--- a/linkis-commons/linkis-httpclient/pom.xml
+++ b/linkis-commons/linkis-httpclient/pom.xml
@@ -70,26 +70,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-commons/linkis-module/pom.xml b/linkis-commons/linkis-module/pom.xml
index e7578565c..b70331e0d 100644
--- a/linkis-commons/linkis-module/pom.xml
+++ b/linkis-commons/linkis-module/pom.xml
@@ -423,26 +423,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-commons/linkis-mybatis/pom.xml b/linkis-commons/linkis-mybatis/pom.xml
index fe0575dfd..3e669e751 100644
--- a/linkis-commons/linkis-mybatis/pom.xml
+++ b/linkis-commons/linkis-mybatis/pom.xml
@@ -75,24 +75,6 @@
<artifactId>druid</artifactId>
<version>${druid.version}</version>
</dependency>
-
</dependencies>
- <build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+
</project>
diff --git a/linkis-commons/linkis-protocol/pom.xml b/linkis-commons/linkis-protocol/pom.xml
index 18bd71d6a..0040f1547 100644
--- a/linkis-commons/linkis-protocol/pom.xml
+++ b/linkis-commons/linkis-protocol/pom.xml
@@ -35,26 +35,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-commons/linkis-rpc/pom.xml b/linkis-commons/linkis-rpc/pom.xml
index 32288d9f7..3a51a0bfc 100644
--- a/linkis-commons/linkis-rpc/pom.xml
+++ b/linkis-commons/linkis-rpc/pom.xml
@@ -107,27 +107,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
-
</plugins>
</build>
diff --git a/linkis-commons/linkis-scheduler/pom.xml b/linkis-commons/linkis-scheduler/pom.xml
index 72fa638ee..a506ca69f 100644
--- a/linkis-commons/linkis-scheduler/pom.xml
+++ b/linkis-commons/linkis-scheduler/pom.xml
@@ -40,26 +40,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-commons/linkis-storage/pom.xml b/linkis-commons/linkis-storage/pom.xml
index eca026739..0237e4a19 100644
--- a/linkis-commons/linkis-storage/pom.xml
+++ b/linkis-commons/linkis-storage/pom.xml
@@ -97,19 +97,10 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/pom.xml b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/pom.xml
index a6d64ba2a..980141f9a 100644
--- a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/pom.xml
+++ b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/pom.xml
@@ -22,7 +22,6 @@
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cli</artifactId>
<version>${revision}</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>linkis-cli-application</artifactId>
<packaging>jar</packaging>
@@ -51,7 +50,7 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-common/pom.xml b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-common/pom.xml
index b9fda5232..4cf081713 100644
--- a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-common/pom.xml
+++ b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-common/pom.xml
@@ -22,13 +22,8 @@
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cli</artifactId>
<version>${revision}</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>linkis-cli-common</artifactId>
<packaging>jar</packaging>
- <build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- </build>
-
</project>
diff --git a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-core/pom.xml b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-core/pom.xml
index b7cfb88d4..4d453144f 100644
--- a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-core/pom.xml
+++ b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-core/pom.xml
@@ -22,7 +22,6 @@
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cli</artifactId>
<version>${revision}</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>linkis-cli-core</artifactId>
<packaging>jar</packaging>
@@ -41,8 +40,4 @@
</dependencies>
- <build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- </build>
-
</project>
diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml b/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml
index af04e1c57..36090c566 100644
--- a/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml
+++ b/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml
@@ -79,35 +79,12 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.yml</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
-
</plugins>
</build>
+
</project>
diff --git a/linkis-computation-governance/linkis-computation-governance-common/pom.xml b/linkis-computation-governance/linkis-computation-governance-common/pom.xml
index 5cd9f25b5..aa4b075a3 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/pom.xml
+++ b/linkis-computation-governance/linkis-computation-governance-common/pom.xml
@@ -51,26 +51,10 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/pom.xml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/pom.xml
index 0a2570410..c636d4fc3 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/pom.xml
@@ -35,33 +35,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/pom.xml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/pom.xml
index a6e7669dd..bfa688bf3 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/pom.xml
@@ -55,33 +55,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml
index 51d4d4844..9f46630b6 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml
@@ -83,31 +83,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.yml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml
index 0c546da56..89aeec71c 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml
@@ -68,33 +68,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-streaming-engineconn/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-streaming-engineconn/pom.xml
index b6a8a47e5..76961a1da 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-streaming-engineconn/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-streaming-engineconn/pom.xml
@@ -29,36 +29,4 @@
<artifactId>linkis-streaming-engineconn</artifactId>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <finalName>${project.artifactId}-${project.version}</finalName>
- </build>
-
</project>
\ No newline at end of file
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml
index e39cf7d90..8d904174b 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml
@@ -117,33 +117,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/pom.xml
index 67645ad92..8556d2160 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/pom.xml
@@ -55,33 +55,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/pom.xml
index dce4e251d..c445da5c0 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/pom.xml
@@ -49,33 +49,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/pom.xml
index c67ad42f8..2818ecbdf 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/pom.xml
@@ -60,33 +60,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/pom.xml
index 73e606a90..a98e83156 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/pom.xml
@@ -54,33 +54,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/pom.xml
index 6ef7f9d7c..7d88c2243 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/pom.xml
@@ -65,33 +65,11 @@
</dependency>
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-entrance/pom.xml b/linkis-computation-governance/linkis-entrance/pom.xml
index b4a38d7ec..26968a61d 100644
--- a/linkis-computation-governance/linkis-entrance/pom.xml
+++ b/linkis-computation-governance/linkis-entrance/pom.xml
@@ -106,26 +106,12 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/Explain.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/Explain.scala
index 1279155ee..1914730d5 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/Explain.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/Explain.scala
@@ -127,11 +127,12 @@ object SQLExplain extends Explain {
logger.warn("sql limit check error happens")
executionCode.contains(IDE_ALLOW_NO_LIMIT)
}
- if (isNoLimitAllowed)
+ if (isNoLimitAllowed) {
logAppender.append(
LogUtils
.generateWarn("please pay attention ,SQL full export mode opened(请注意,SQL全量导出模式打开)\n")
)
+ }
if (tempCode.contains("""\;""")) {
val semicolonIndexes = findRealSemicolonIndex(tempCode)
var oldIndex = 0
@@ -303,7 +304,7 @@ object SQLExplain extends Explain {
}
private def isUpperSelect(selectSql: String): Boolean = {
- if (selectSql.trim.startsWith("SELECT")) true else false
+ selectSql.trim.startsWith("SELECT")
}
}
diff --git a/linkis-computation-governance/linkis-jdbc-driver/pom.xml b/linkis-computation-governance/linkis-jdbc-driver/pom.xml
index e3f7dea50..c215e2b71 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/pom.xml
+++ b/linkis-computation-governance/linkis-jdbc-driver/pom.xml
@@ -45,41 +45,13 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
+
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.yml</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
+
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
index c1f540036..99f461397 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
@@ -112,37 +112,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.yml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/dao/impl/EngineConnBmlResourceMapper.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/common/EngineConnBmlResourceMapper.xml
similarity index 100%
rename from linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/dao/impl/EngineConnBmlResourceMapper.xml
rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/common/EngineConnBmlResourceMapper.xml
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/external/dao/impl/ExternalResourceProviderDaoImpl.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/common/ExternalResourceProviderDaoImpl.xml
similarity index 100%
rename from linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/external/dao/impl/ExternalResourceProviderDaoImpl.xml
rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/common/ExternalResourceProviderDaoImpl.xml
diff --git a/linkis-computation-governance/linkis-manager/linkis-label-common/pom.xml b/linkis-computation-governance/linkis-manager/linkis-label-common/pom.xml
index bd9d658dd..821dcb54d 100644
--- a/linkis-computation-governance/linkis-manager/linkis-label-common/pom.xml
+++ b/linkis-computation-governance/linkis-manager/linkis-label-common/pom.xml
@@ -59,26 +59,10 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-common/pom.xml b/linkis-computation-governance/linkis-manager/linkis-manager-common/pom.xml
index de5ca472c..08822a5c4 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-common/pom.xml
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-common/pom.xml
@@ -69,33 +69,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <!--<excludes>-->
- <!--<exclude>**/*.yml</exclude>-->
- <!--<exclude>**/*.properties</exclude>-->
- <!--<exclude>**/*.sh</exclude>-->
- <!--</excludes>-->
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/pom.xml b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/pom.xml
index ca080fcf7..ed2ca8084 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/pom.xml
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/pom.xml
@@ -68,33 +68,12 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
-
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ECResourceRecordMapper.xml b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/ECResourceRecordMapper.xml
similarity index 100%
rename from linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ECResourceRecordMapper.xml
rename to linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/ECResourceRecordMapper.xml
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/LabelManagerMapper.xml b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/LabelManagerMapper.xml
similarity index 100%
rename from linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/LabelManagerMapper.xml
rename to linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/LabelManagerMapper.xml
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/LockManagerMapper.xml b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/LockManagerMapper.xml
similarity index 100%
rename from linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/LockManagerMapper.xml
rename to linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/LockManagerMapper.xml
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/NodeManagerMapper.xml b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/NodeManagerMapper.xml
similarity index 100%
rename from linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/NodeManagerMapper.xml
rename to linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/NodeManagerMapper.xml
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/NodeMetricManagerMapper.xml b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/NodeMetricManagerMapper.xml
similarity index 100%
rename from linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/NodeMetricManagerMapper.xml
rename to linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/NodeMetricManagerMapper.xml
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ResourceManagerMapper.xml b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/ResourceManagerMapper.xml
similarity index 100%
rename from linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ResourceManagerMapper.xml
rename to linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/ResourceManagerMapper.xml
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties
index ca7d27a23..59651dc3a 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties
@@ -32,7 +32,7 @@ spring.datasource.hikari.idle-timeout=600000
spring.datasource.hikari.leak-detection-threshold=0
spring.datasource.hikari.initialization-fail-timeout=1
-mybatis-plus.mapper-locations=org/apache/linkis/manager/dao/impl/*.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
#disable eureka discovery client
diff --git a/linkis-dist/package/conf/linkis-cg-linkismanager.properties b/linkis-dist/package/conf/linkis-cg-linkismanager.properties
index dce88b9d4..5755b4c63 100644
--- a/linkis-dist/package/conf/linkis-cg-linkismanager.properties
+++ b/linkis-dist/package/conf/linkis-cg-linkismanager.properties
@@ -16,7 +16,7 @@
# wds.linkis.engineconn.debug.enable=true
#
##mybatis
-wds.linkis.server.mybatis.mapperLocations=classpath:org/apache/linkis/manager/dao/impl/*.xml,org/apache/linkis/manager/rm/external/dao/impl/ExternalResourceProviderDaoImpl.xml,classpath:org/apache/linkis/engineplugin/server/dao/impl/*.xml
+wds.linkis.server.mybatis.mapperLocations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
wds.linkis.server.mybatis.typeAliasesPackage=
wds.linkis.server.mybatis.BasePackage=org.apache.linkis.manager.dao,org.apache.linkis.manager.rm.external.dao,org.apache.linkis.engineplugin.server.dao
diff --git a/linkis-dist/package/conf/linkis-mg-gateway.properties b/linkis-dist/package/conf/linkis-mg-gateway.properties
index a43b50f94..8e02e6431 100644
--- a/linkis-dist/package/conf/linkis-mg-gateway.properties
+++ b/linkis-dist/package/conf/linkis-mg-gateway.properties
@@ -20,7 +20,7 @@ wds.linkis.gateway.conf.enable.proxy.user=false
wds.linkis.gateway.conf.url.pass.auth=/dss/
wds.linkis.gateway.conf.enable.token.auth=true
wds.linkis.is.gateway=true
-wds.linkis.server.mybatis.mapperLocations=classpath*:org/apache/linkis/instance/label/dao/impl/*.xml,classpath*:org/apache/linkis/gateway/authentication/dao/impl/*.xml
+wds.linkis.server.mybatis.mapperLocations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.instance.label.entity
wds.linkis.server.mybatis.BasePackage=org.apache.linkis.instance.label.dao,org.apache.linkis.gateway.authentication.dao
wds.linkis.label.entity.packages=org.apache.linkis.gateway.ujes.route.label
diff --git a/linkis-dist/package/conf/linkis-ps-publicservice.properties b/linkis-dist/package/conf/linkis-ps-publicservice.properties
index fab495f7a..797bb9188 100644
--- a/linkis-dist/package/conf/linkis-ps-publicservice.properties
+++ b/linkis-dist/package/conf/linkis-ps-publicservice.properties
@@ -19,7 +19,7 @@ wds.linkis.server.mdm.service.instance.expire-in-seconds=1800
wds.linkis.server.restful.scan.packages=org.apache.linkis.cs.server.restful,org.apache.linkis.datasourcemanager.core.restful,org.apache.linkis.metadata.query.server.restful,org.apache.linkis.jobhistory.restful,org.apache.linkis.variable.restful,org.apache.linkis.configuration.restful,org.apache.linkis.udf.api,org.apache.linkis.filesystem.restful,org.apache.linkis.filesystem.restful,org.apache.linkis.instance.label.restful,org.apache.linkis.metadata.restful.api,org.apache.linkis.cs.server [...]
##mybatis
-wds.linkis.server.mybatis.mapperLocations=classpath*:org/apache/linkis/cs/persistence/dao/impl/*.xml,classpath:org/apache/linkis/datasourcemanager/core/dao/mapper/*.xml,classpath:org/apache/linkis/jobhistory/dao/impl/*.xml,classpath:org/apache/linkis/variable/dao/impl/*.xml,classpath:org/apache/linkis/configuration/dao/impl/*.xml,classpath:org/apache/linkis/udf/dao/impl/*.xml,classpath:org/apache/linkis/instance/label/dao/impl/*.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/*.xm [...]
+wds.linkis.server.mybatis.mapperLocations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.cs.persistence.entity,org.apache.linkis.datasourcemanager.common.domain,org.apache.linkis.datasourcemanager.core.vo,org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.entity,org.apache.linkis.bml.Entity,org.apache [...]
wds.linkis.server.mybatis.BasePackage=org.apache.linkis.cs.persistence.dao,org.apache.linkis.datasourcemanager.core.dao,org.apache.linkis.jobhistory.dao,org.apache.linkis.variable.dao,org.apache.linkis.configuration.dao,org.apache.linkis.udf.dao,org.apache.linkis.instance.label.dao,org.apache.linkis.metadata.hive.dao,org.apache.linkis.metadata.dao,org.apache.linkis.bml.dao,org.apache.linkis.errorcode.server.dao,org.apache.linkis.publicservice.common.lock.dao,org.apache.linkis.basedataman [...]
diff --git a/linkis-engineconn-plugins/elasticsearch/pom.xml b/linkis-engineconn-plugins/elasticsearch/pom.xml
index e44ce6ce5..6b8cc7d1a 100644
--- a/linkis-engineconn-plugins/elasticsearch/pom.xml
+++ b/linkis-engineconn-plugins/elasticsearch/pom.xml
@@ -100,30 +100,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.yml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/flink/pom.xml b/linkis-engineconn-plugins/flink/pom.xml
index 7fe6ea8c9..714834910 100644
--- a/linkis-engineconn-plugins/flink/pom.xml
+++ b/linkis-engineconn-plugins/flink/pom.xml
@@ -442,37 +442,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/hive/pom.xml b/linkis-engineconn-plugins/hive/pom.xml
index 60830ffca..2b0fbae4d 100644
--- a/linkis-engineconn-plugins/hive/pom.xml
+++ b/linkis-engineconn-plugins/hive/pom.xml
@@ -332,36 +332,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/io_file/pom.xml b/linkis-engineconn-plugins/io_file/pom.xml
index 0696743b7..4aeddd125 100644
--- a/linkis-engineconn-plugins/io_file/pom.xml
+++ b/linkis-engineconn-plugins/io_file/pom.xml
@@ -96,36 +96,13 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
+ <plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/jdbc/pom.xml b/linkis-engineconn-plugins/jdbc/pom.xml
index 02f8628bf..b42cb1ae8 100644
--- a/linkis-engineconn-plugins/jdbc/pom.xml
+++ b/linkis-engineconn-plugins/jdbc/pom.xml
@@ -213,31 +213,12 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.yml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/openlookeng/pom.xml b/linkis-engineconn-plugins/openlookeng/pom.xml
index 26a15a02a..7f9f02f3a 100644
--- a/linkis-engineconn-plugins/openlookeng/pom.xml
+++ b/linkis-engineconn-plugins/openlookeng/pom.xml
@@ -100,31 +100,12 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.yml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/pipeline/pom.xml b/linkis-engineconn-plugins/pipeline/pom.xml
index d352dac1a..4ff0bdf93 100644
--- a/linkis-engineconn-plugins/pipeline/pom.xml
+++ b/linkis-engineconn-plugins/pipeline/pom.xml
@@ -96,37 +96,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/presto/pom.xml b/linkis-engineconn-plugins/presto/pom.xml
index 8a415f10d..0394a0fcb 100644
--- a/linkis-engineconn-plugins/presto/pom.xml
+++ b/linkis-engineconn-plugins/presto/pom.xml
@@ -84,30 +84,13 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.yml</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
+ <plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/python/pom.xml b/linkis-engineconn-plugins/python/pom.xml
index 0d510ea7a..6ede3100f 100644
--- a/linkis-engineconn-plugins/python/pom.xml
+++ b/linkis-engineconn-plugins/python/pom.xml
@@ -106,36 +106,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2*.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/python/src/main/resources/log4j2.xml b/linkis-engineconn-plugins/python/src/main/resources/log4j2.xml
index 3181762fc..a385c888f 100644
--- a/linkis-engineconn-plugins/python/src/main/resources/log4j2.xml
+++ b/linkis-engineconn-plugins/python/src/main/resources/log4j2.xml
@@ -18,7 +18,7 @@
<configuration status="error" monitorInterval="30">
<appenders>
- <RollingFile name="RollingFile" append="true" fileName="${env:LOG_DIRS}/stdout"
+ <RollingFile name="RollingFile" append="true" fileName="${env:LOG_DIRS:-logs}/stdout"
filePattern="${env:LOG_DIRS}/$${date:yyyy-MM}/linkis-log-%d{yyyy-MM-dd-hh}-%i.log">
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
<Policies>
diff --git a/linkis-engineconn-plugins/seatunnel/pom.xml b/linkis-engineconn-plugins/seatunnel/pom.xml
index 938600119..e831db2be 100644
--- a/linkis-engineconn-plugins/seatunnel/pom.xml
+++ b/linkis-engineconn-plugins/seatunnel/pom.xml
@@ -117,36 +117,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/shell/pom.xml b/linkis-engineconn-plugins/shell/pom.xml
index 07026d229..ff0dd5184 100755
--- a/linkis-engineconn-plugins/shell/pom.xml
+++ b/linkis-engineconn-plugins/shell/pom.xml
@@ -114,37 +114,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/spark/pom.xml b/linkis-engineconn-plugins/spark/pom.xml
index eb6c1f83a..da123937f 100644
--- a/linkis-engineconn-plugins/spark/pom.xml
+++ b/linkis-engineconn-plugins/spark/pom.xml
@@ -421,37 +421,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/spark/src/main/resources/log4j2.xml b/linkis-engineconn-plugins/spark/src/main/resources/log4j2.xml
index feb521a57..4a4ea5d55 100644
--- a/linkis-engineconn-plugins/spark/src/main/resources/log4j2.xml
+++ b/linkis-engineconn-plugins/spark/src/main/resources/log4j2.xml
@@ -18,7 +18,7 @@
<configuration status="error" monitorInterval="30">
<appenders>
- <RollingFile name="RollingFile" append="true" fileName="${env:LOG_DIRS}/stdout"
+ <RollingFile name="RollingFile" append="true" fileName="${env:LOG_DIRS:-logs}/stdout"
filePattern="${env:LOG_DIRS}/$${date:yyyy-MM}/linkis-log-%d{yyyy-MM-dd-hh}-%i.log">
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
<Policies>
diff --git a/linkis-engineconn-plugins/sqoop/pom.xml b/linkis-engineconn-plugins/sqoop/pom.xml
index 6027dee77..c703cab7d 100644
--- a/linkis-engineconn-plugins/sqoop/pom.xml
+++ b/linkis-engineconn-plugins/sqoop/pom.xml
@@ -212,36 +212,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/trino/pom.xml b/linkis-engineconn-plugins/trino/pom.xml
index a10fcb6de..246f54751 100644
--- a/linkis-engineconn-plugins/trino/pom.xml
+++ b/linkis-engineconn-plugins/trino/pom.xml
@@ -71,30 +71,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.yml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-extensions/linkis-io-file-client/pom.xml b/linkis-extensions/linkis-io-file-client/pom.xml
index 22c78eb42..8aad8e316 100644
--- a/linkis-extensions/linkis-io-file-client/pom.xml
+++ b/linkis-extensions/linkis-io-file-client/pom.xml
@@ -50,19 +50,10 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
diff --git a/linkis-orchestrator/linkis-code-orchestrator/pom.xml b/linkis-orchestrator/linkis-code-orchestrator/pom.xml
index aa1ff8c26..b9c66b6dd 100644
--- a/linkis-orchestrator/linkis-code-orchestrator/pom.xml
+++ b/linkis-orchestrator/linkis-code-orchestrator/pom.xml
@@ -36,34 +36,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.yml</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>log4j2-spring.xml</exclude>
- <exclude>${basedir}/src/test/*</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/pom.xml b/linkis-orchestrator/linkis-computation-orchestrator/pom.xml
index 0474fc142..0600f9291 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/pom.xml
+++ b/linkis-orchestrator/linkis-computation-orchestrator/pom.xml
@@ -49,34 +49,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.yml</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>log4j2-spring.xml</exclude>
- <exclude>${basedir}/src/test/*</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-orchestrator/linkis-orchestrator-core/pom.xml b/linkis-orchestrator/linkis-orchestrator-core/pom.xml
index e4b279113..55c92f475 100644
--- a/linkis-orchestrator/linkis-orchestrator-core/pom.xml
+++ b/linkis-orchestrator/linkis-orchestrator-core/pom.xml
@@ -53,34 +53,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.yml</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>log4j2-spring.xml</exclude>
- <exclude>${basedir}/src/test/*</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/pom.xml b/linkis-public-enhancements/linkis-basedata-manager/pom.xml
index 553bb572f..da354f952 100644
--- a/linkis-public-enhancements/linkis-basedata-manager/pom.xml
+++ b/linkis-public-enhancements/linkis-basedata-manager/pom.xml
@@ -51,31 +51,12 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/assembly/distribution.xml
index 195bcc4f7..5183fc651 100644
--- a/linkis-public-enhancements/linkis-basedata-manager/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-basedata-manager/src/main/assembly/distribution.xml
@@ -173,18 +173,6 @@
</excludes>
</dependencySet>
</dependencySets>
- <!-- 文件集合 -->
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>conf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
</assembly>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/CgManagerLabelMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/CgManagerLabelMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/CgManagerLabelMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/CgManagerLabelMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/ConfigurationConfigKeyMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/ConfigurationConfigKeyMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/ConfigurationConfigKeyMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/ConfigurationConfigKeyMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/ConfigurationConfigValueMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/ConfigurationConfigValueMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/ConfigurationConfigValueMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/ConfigurationConfigValueMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/ConfigurationKeyEngineRelationMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/ConfigurationKeyEngineRelationMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/ConfigurationKeyEngineRelationMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/ConfigurationKeyEngineRelationMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceAccessMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceAccessMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceAccessMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceAccessMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceEnvMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceEnvMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceEnvMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceEnvMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeKeyMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceTypeKeyMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeKeyMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceTypeKeyMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceTypeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceTypeMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/GatewayAuthTokenMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/GatewayAuthTokenMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/GatewayAuthTokenMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/GatewayAuthTokenMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/PsErrorCodeMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/PsErrorCodeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/PsErrorCodeMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/PsErrorCodeMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/RmExternalResourceProviderMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/RmExternalResourceProviderMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/RmExternalResourceProviderMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/RmExternalResourceProviderMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/UdfManagerMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfManagerMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/UdfManagerMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfManagerMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/UdfTreeMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfTreeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/UdfTreeMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfTreeMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml
index e89d88204..4089111c3 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml
@@ -57,25 +57,11 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml
index b1cfef154..cd0df3540 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml
@@ -33,19 +33,10 @@
</resource>
</resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
index 8b0b0f35a..8078966fc 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
@@ -63,37 +63,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/assembly/distribution.xml
index 9bf1c8746..8bb0f9ee4 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/assembly/distribution.xml
@@ -35,25 +35,6 @@
<unpack>false</unpack>
<useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
- <!--<excludes>
- <exclude>log4j:log4j:*</exclude>
- <exclude>org.springframework.cloud:spring-*:*</exclude>
- <exclude>org.springframework.*</exclude>
- <exclude>org.glassfish.*</exclude>
- <exclude>org.scala*</exclude>
- <exclude>org.slf4j:*</exclude>
- <exclude>org.json*</exclude>
- <exclude>org.mybatis</exclude>
- <exclude>cglib:*</exclude>
- <exclude>com.google*</exclude>
- <exclude>com.fasterxml*</exclude>
- <exclude>com.sun.jersey*</exclude>
- <exclude>org.eclipse.jetty*</exclude>
- <exclude>org.apache.commons:commons*</exclude>
- <exclude>commons*</exclude>
- <exclude>org.apache.hadoop:*</exclude>
- <exclude>io.netty:netty*</exclude>
- </excludes>-->
<excludes>
<exclude>antlr:antlr:jar</exclude>
<exclude>aopalliance:aopalliance:jar</exclude>
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/BmlProjectMapper.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/BmlProjectMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/BmlProjectMapper.xml
rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/BmlProjectMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/DownloadMapper.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/DownloadMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/DownloadMapper.xml
rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/DownloadMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/ResourceMapper.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/ResourceMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/ResourceMapper.xml
rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/ResourceMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/TaskMapper.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/TaskMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/TaskMapper.xml
rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/TaskMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/VersionMapper.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/VersionMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/VersionMapper.xml
rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/VersionMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties
index 9a2c8bfd2..fee53af98 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties
@@ -32,7 +32,7 @@ spring.datasource.hikari.idle-timeout=600000
spring.datasource.hikari.leak-detection-threshold=0
spring.datasource.hikari.initialization-fail-timeout=1
-mybatis-plus.mapper-locations=classpath:org/apache/linkis/bml/dao/impl/*.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org.apache.linkis.bml.ntity
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/linkis-public-enhancements/linkis-configuration/pom.xml b/linkis-public-enhancements/linkis-configuration/pom.xml
index 111c73089..fc7faea35 100644
--- a/linkis-public-enhancements/linkis-configuration/pom.xml
+++ b/linkis-public-enhancements/linkis-configuration/pom.xml
@@ -62,39 +62,11 @@
</dependencies>
<build>
-
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
-
</build>
</project>
diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml b/linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/common/ConfigMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml
rename to linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/common/ConfigMapper.xml
diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/LabelMapper.xml b/linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/common/LabelMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/LabelMapper.xml
rename to linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/common/LabelMapper.xml
diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/UserIpMapper.xml b/linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/common/UserIpMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/UserIpMapper.xml
rename to linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/common/UserIpMapper.xml
diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/UserTenantMapper.xml b/linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/common/UserTenantMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/UserTenantMapper.xml
rename to linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/common/UserTenantMapper.xml
diff --git a/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/LabelMapperTest.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/LabelMapperTest.java
index 0b4de753a..004624681 100644
--- a/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/LabelMapperTest.java
+++ b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/LabelMapperTest.java
@@ -41,10 +41,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.util.Arrays;
import java.util.Date;
-import org.h2.tools.Server;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -66,17 +62,6 @@ public class LabelMapperTest extends BaseDaoTest {
return configLabel;
}
- @BeforeAll
- @DisplayName("Each unit test method is executed once before execution")
- protected static void beforeAll() throws Exception {
- // Start the console of h2 to facilitate viewing of h2 data
- Server.createWebServer("-web", "-webAllowOthers", "-webPort", "8082").start();
- }
-
- @AfterAll
- @DisplayName("Each unit test method is executed once before execution")
- protected static void afterAll() throws Exception {}
-
@Test
void testGetLabelByKeyValue() {
ConfigLabel configLabel =
diff --git a/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApiTest.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApiTest.java
index 610025e3d..77c77d926 100644
--- a/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApiTest.java
+++ b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApiTest.java
@@ -40,27 +40,11 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
-/*
- * 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.
- */
@ExtendWith({SpringExtension.class})
@AutoConfigureMockMvc
@SpringBootTest(classes = {WebApplicationServer.class, Scan.class})
public class ConfigurationRestfulApiTest {
- private Logger logger = LoggerFactory.getLogger(ConfigurationRestfulApiTest.class);
+ private final Logger logger = LoggerFactory.getLogger(ConfigurationRestfulApiTest.class);
@Autowired protected MockMvc mockMvc;
diff --git a/linkis-public-enhancements/linkis-configuration/src/test/resources/application.properties b/linkis-public-enhancements/linkis-configuration/src/test/resources/application.properties
index 2cbbf93f6..46fbf170f 100644
--- a/linkis-public-enhancements/linkis-configuration/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-configuration/src/test/resources/application.properties
@@ -57,6 +57,6 @@ spring.cloud.service-registry.auto-registration.enabled=false
eureka.client.enabled=false
eureka.client.serviceUrl.registerWithEureka=false
-mybatis-plus.mapper-locations=classpath:org/apache/linkis/configuration/dao/impl/*.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org.apache.linkis.configuration.entity
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml
index 072a55d63..087d48a17 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml
@@ -61,24 +61,11 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml
index 177745141..40538fd87 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml
@@ -42,27 +42,4 @@
</dependencies>
- <build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml
index 618daa361..a6e2b0016 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml
@@ -40,27 +40,4 @@
</dependency>
</dependencies>
- <build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
index 7518e0814..9d52ba623 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
@@ -81,38 +81,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/assembly/distribution.xml
index 22638e590..eb31eff79 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/assembly/distribution.xml
@@ -47,33 +47,5 @@
</dependencySet>
</dependencySets>
- <fileSets>
- <fileSet>
- <directory>${basedir}/conf</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>conf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- <!--<fileSet>
- <directory>${basedir}/bin</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>bin</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- <fileSet>
- <directory>.</directory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- <outputDirectory>logs</outputDirectory>
- </fileSet>-->
- </fileSets>
-
</assembly>
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextHistoryMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextHistoryMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextHistoryMapper.xml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextHistoryMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDListenerMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextIDListenerMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDListenerMapper.xml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextIDListenerMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextIDMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDMapper.xml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextIDMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextKeyListenerMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextKeyListenerMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextKeyListenerMapper.xml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextKeyListenerMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextMapMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextMapMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextMapMapper.xml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextMapMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties
index 24a4cff1c..b9ed613e6 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties
@@ -54,6 +54,6 @@ spring.cloud.service-registry.auto-registration.enabled=false
eureka.client.enabled=false
eureka.client.serviceUrl.registerWithEureka=false
-mybatis-plus.mapper-locations=classpath:org/apache/linkis/cs/persistence/dao/impl/*.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org.apache.linkis.cs.persistence.entity
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
index d5f54e9eb..0b29d6937 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
@@ -47,34 +47,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.yml</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml
index aea6e8851..505959fea 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml
@@ -26,11 +26,6 @@
<artifactId>linkis-datasource-manager-common</artifactId>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <um.version>1.0.12</um.version>
- </properties>
-
<dependencies>
<!--rpc-->
<dependency>
@@ -59,26 +54,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
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 efced5390..3fcdaea9c 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
@@ -26,10 +26,6 @@
<artifactId>linkis-datasource-manager-server</artifactId>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
@@ -104,32 +100,12 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-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 e75135259..ec03bb0f0 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
@@ -184,17 +184,5 @@
</dependencySet>
</dependencySets>
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>conf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
-
</assembly>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSouceMapper.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSouceMapper.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceEnvMapper.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceEnvMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceEnvMapper.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceEnvMapper.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceParamKeyMapper.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceParamKeyMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceParamKeyMapper.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceParamKeyMapper.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeMapper.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceTypeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeMapper.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceTypeMapper.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceVersionMapper.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceVersionMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceVersionMapper.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceVersionMapper.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/resources/application.properties
index 2fc61e00b..cf6a7c018 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/resources/application.properties
@@ -32,7 +32,7 @@ spring.datasource.hikari.idle-timeout=600000
spring.datasource.hikari.leak-detection-threshold=0
spring.datasource.hikari.initialization-fail-timeout=1
-mybatis-plus.mapper-locations=classpath:org/apache/linkis/datasourcemanager/core/dao/mapper/*.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org.apache.linkis.datasourcemanager.common.domain
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml
index a5f1a5633..88e6dea1f 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml
@@ -26,10 +26,6 @@
<artifactId>linkis-metadata-query-common</artifactId>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
@@ -63,26 +59,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
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
index 4954c64b5..21705e23f 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
@@ -54,26 +54,12 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml
index ffd6c61ea..ec0e6daea 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml
@@ -27,7 +27,6 @@
<artifactId>linkis-metadata-query-service-es</artifactId>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<es.version>6.8.15</es.version>
</properties>
@@ -58,26 +57,7 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
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-metadata-query/service/elasticsearch/src/main/assembly/distribution.xml
index b463956e4..ef740fd1c 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/assembly/distribution.xml
@@ -39,17 +39,5 @@
</dependencySet>
</dependencySets>
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>conf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
-
</assembly>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml
index 5541ee283..fc10752cf 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml
@@ -26,9 +26,6 @@
<artifactId>linkis-metadata-query-service-hdfs</artifactId>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
@@ -56,30 +53,10 @@
</dependency>
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.2.0</version>
<inherited>false</inherited>
<configuration>
<skipAssembly>false</skipAssembly>
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-metadata-query/service/hdfs/src/main/assembly/distribution.xml
index 912fabc9a..58c5f6520 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/src/main/assembly/distribution.xml
@@ -41,17 +41,5 @@
</dependencySet>
</dependencySets>
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>conf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
-
</assembly>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
index 616018171..127913944 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
@@ -26,7 +26,6 @@
<artifactId>linkis-metadata-query-service-hive</artifactId>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hive.version>2.3.3</hive.version>
<hadoop.version>2.7.2</hadoop.version>
<datanucleus-api-jdo.version>4.2.4</datanucleus-api-jdo.version>
@@ -261,38 +260,7 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -313,11 +281,6 @@
<goal>single</goal>
</goals>
<phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/distribution.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
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-metadata-query/service/hive/src/main/assembly/distribution.xml
index e2e2b5d0f..51550e7f0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/assembly/distribution.xml
@@ -221,17 +221,5 @@
</dependencySet>
</dependencySets>
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>conf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
-
</assembly>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml
index c720dcb65..114e244d9 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml
@@ -27,8 +27,6 @@
<artifactId>linkis-metadata-query-service-jdbc</artifactId>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <mysql.version>8.0.28</mysql.version>
<postgresql.version>42.3.8</postgresql.version>
<clickhouse.version>0.3.2-patch11</clickhouse.version>
</properties>
@@ -76,30 +74,10 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.2.0</version>
<inherited>false</inherited>
<configuration>
<skipAssembly>false</skipAssembly>
@@ -117,11 +95,6 @@
<goal>single</goal>
</goals>
<phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/distribution.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
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-metadata-query/service/jdbc/src/main/assembly/distribution.xml
index 67746c06e..65894449f 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/assembly/distribution.xml
@@ -39,17 +39,5 @@
</dependencySet>
</dependencySets>
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>conf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
-
</assembly>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
index 3a3dfa3d5..720e38129 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
@@ -25,10 +25,6 @@
</parent>
<artifactId>linkis-metadata-query-service-kafka</artifactId>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
@@ -58,38 +54,7 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -110,11 +75,6 @@
<goal>single</goal>
</goals>
<phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/distribution.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
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-metadata-query/service/kafka/src/main/assembly/distribution.xml
index 4181b7b3f..a16c56d36 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/assembly/distribution.xml
@@ -40,17 +40,5 @@
</dependencySet>
</dependencySets>
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>conf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
-
</assembly>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml
index aa07a6bb4..db8d4e0a4 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml
@@ -26,11 +26,6 @@
<artifactId>linkis-metadata-query-service-mongodb</artifactId>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <es.version>6.7.1</es.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
@@ -64,22 +59,7 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -100,11 +80,6 @@
<goal>single</goal>
</goals>
<phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/distribution.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
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-metadata-query/service/mongodb/src/main/assembly/distribution.xml
index 9498662cd..278c1133b 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/src/main/assembly/distribution.xml
@@ -41,17 +41,5 @@
</dependencySet>
</dependencySets>
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>conf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
-
</assembly>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom.xml
index 0037dba9f..3f683a33f 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom.xml
@@ -53,7 +53,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
</dependency>
<dependency>
@@ -99,37 +98,12 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/assembly/distribution.xml
index 0d872b497..d184d8358 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/assembly/distribution.xml
@@ -35,25 +35,6 @@
<unpack>false</unpack>
<useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
- <!--<excludes>
- <exclude>log4j:log4j:*</exclude>
- <exclude>org.springframework.cloud:spring-*:*</exclude>
- <exclude>org.springframework.*</exclude>
- <exclude>org.glassfish.*</exclude>
- <exclude>org.scala*</exclude>
- <exclude>org.slf4j:*</exclude>
- <exclude>org.json*</exclude>
- <exclude>org.mybatis</exclude>
- <exclude>cglib:*</exclude>
- <exclude>com.google*</exclude>
- <exclude>com.fasterxml*</exclude>
- <exclude>com.sun.jersey*</exclude>
- <exclude>org.eclipse.jetty*</exclude>
- <exclude>org.apache.commons:commons*</exclude>
- <exclude>commons*</exclude>
- <exclude>org.apache.hadoop:*</exclude>
- <exclude>io.netty:netty*</exclude>
- </excludes>-->
<excludes>
<exclude>antlr:antlr:jar</exclude>
<exclude>aopalliance:aopalliance:jar</exclude>
@@ -193,33 +174,5 @@
</dependencySet>
</dependencySets>
- <fileSets>
- <fileSet>
- <directory>${basedir}/conf</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>conf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- <!--<fileSet>
- <directory>${basedir}/bin</directory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0777</fileMode>
- <outputDirectory>bin</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- <fileSet>
- <directory>.</directory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- <outputDirectory>logs</outputDirectory>
- </fileSet>-->
- </fileSets>
-
</assembly>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/hive/dao/impl/HiveMetaDao.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/resources/mapper/common/HiveMetaDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/hive/dao/impl/HiveMetaDao.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/resources/mapper/common/HiveMetaDao.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/dao/impl/MdqDao.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/resources/mapper/common/MdqDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/dao/impl/MdqDao.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/resources/mapper/common/MdqDao.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/test/resources/application.properties b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/test/resources/application.properties
index 5b519435c..c2c826c38 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/test/resources/application.properties
@@ -54,6 +54,6 @@ spring.cloud.service-registry.auto-registration.enabled=false
eureka.client.enabled=false
eureka.client.serviceUrl.registerWithEureka=false
-mybatis-plus.mapper-locations=classpath:org/apache/linkis/metadata/dao/impl/MdqDao.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/HiveMetaDao.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org.apache.linkis.metadata.domain.mdq.po
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml
index 5ca59b0e5..d532ca246 100644
--- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml
+++ b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml
@@ -49,19 +49,10 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml
index ae60c58e8..f55fea97f 100644
--- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml
+++ b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml
@@ -36,19 +36,10 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml
index 597a1f16a..8c17af97a 100644
--- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml
+++ b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml
@@ -43,42 +43,6 @@
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-mybatis</artifactId>
</dependency>
-
</dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/impl/ErrorCodeMapper.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/resources/mapper/common/ErrorCodeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/impl/ErrorCodeMapper.xml
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/resources/mapper/common/ErrorCodeMapper.xml
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/application.properties
index bd67bb1ab..c96ef2495 100644
--- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/application.properties
@@ -57,6 +57,6 @@ spring.cloud.service-registry.auto-registration.enabled=false
eureka.client.enabled=false
eureka.client.serviceUrl.registerWithEureka=false
-mybatis-plus.mapper-locations=classpath:org/apache/linkis/errorcode/server/dao/impl/*.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org.apache.linkis.errorcode.common
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml
index f0d34e7d6..9c4add9a3 100644
--- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml
+++ b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml
@@ -43,36 +43,11 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml
index cbc1056d9..cfcf5ab9b 100644
--- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml
+++ b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml
@@ -57,36 +57,11 @@
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InsLabelRelationMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InsLabelRelationMapper.xml
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceInfoMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InstanceInfoMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceInfoMapper.xml
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InstanceInfoMapper.xml
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceLabelMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InstanceLabelMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceLabelMapper.xml
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InstanceLabelMapper.xml
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties
index df2c75307..6db0204f8 100644
--- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties
@@ -32,7 +32,7 @@ spring.datasource.hikari.idle-timeout=600000
spring.datasource.hikari.leak-detection-threshold=0
spring.datasource.hikari.initialization-fail-timeout=1
-mybatis-plus.mapper-locations=classpath:org/apache/linkis/instance/label/dao/impl/*.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org.apache.linkis.instance.label.entity
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/linkis-public-enhancements/linkis-jobhistory/pom.xml b/linkis-public-enhancements/linkis-jobhistory/pom.xml
index 77ba3f1e0..895c8747c 100644
--- a/linkis-public-enhancements/linkis-jobhistory/pom.xml
+++ b/linkis-public-enhancements/linkis-jobhistory/pom.xml
@@ -68,36 +68,11 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobDetailMapper.xml b/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobDetailMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobDetailMapper.xml
rename to linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobDetailMapper.xml
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobHistoryMapper.xml b/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobHistoryMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobHistoryMapper.xml
rename to linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobHistoryMapper.xml
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties b/linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties
index a376233aa..88aba0128 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties
@@ -54,6 +54,6 @@ spring.cloud.service-registry.auto-registration.enabled=false
eureka.client.enabled=false
eureka.client.serviceUrl.registerWithEureka=false
-mybatis-plus.mapper-locations=classpath:org/apache/linkis/jobhistory/dao/impl/JobDetailMapper.xml,classpath:org/apache/linkis/jobhistory/dao/impl/JobHistoryMapper.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org.apache.linkis.jobhistory.entity
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/linkis-public-enhancements/linkis-ps-common-lock/pom.xml b/linkis-public-enhancements/linkis-ps-common-lock/pom.xml
index 3a55034b4..339779d63 100644
--- a/linkis-public-enhancements/linkis-ps-common-lock/pom.xml
+++ b/linkis-public-enhancements/linkis-ps-common-lock/pom.xml
@@ -50,33 +50,7 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
-
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
diff --git a/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/impl/CommonLockMapper.xml b/linkis-public-enhancements/linkis-ps-common-lock/src/main/resources/mapper/common/CommonLockMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/impl/CommonLockMapper.xml
rename to linkis-public-enhancements/linkis-ps-common-lock/src/main/resources/mapper/common/CommonLockMapper.xml
diff --git a/linkis-public-enhancements/linkis-ps-common-lock/src/test/resources/application.properties b/linkis-public-enhancements/linkis-ps-common-lock/src/test/resources/application.properties
index 6286bf0e4..2f7d2ea8b 100644
--- a/linkis-public-enhancements/linkis-ps-common-lock/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-ps-common-lock/src/test/resources/application.properties
@@ -56,6 +56,6 @@ spring.cloud.service-registry.auto-registration.enabled=false
eureka.client.enabled=false
eureka.client.serviceUrl.registerWithEureka=false
-mybatis-plus.mapper-locations=classpath:org/apache/linkis/publicservice/common/lock/dao/impl/*.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org/apache/linkis/publicservice/common/lock/entity
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml
index 9ac02720a..68a646925 100644
--- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml
+++ b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml
@@ -52,19 +52,10 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml
index a7ca19aac..b3310186f 100644
--- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml
+++ b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml
@@ -49,7 +49,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
- <version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -80,36 +79,11 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/resources/application.yml b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/resources/application.yml
deleted file mode 100644
index aee5e7e9d..000000000
--- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/resources/application.yml
+++ /dev/null
@@ -1,47 +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.
-#
-
-server:
- port: 9666
-spring:
- application:
- name: linkis-ps-storage-script-dev
-
-
-eureka:
- client:
- serviceUrl:
- defaultZone: http://127.0.0.1:20303/eureka/
- instance:
- metadata-map:
- test: linkis
-
-management:
- endpoints:
- web:
- exposure:
- include: refresh,info
-logging:
- config: classpath:log4j2.xml
-
-pagehelper:
- helper-dialect: mysql
- reasonable: true
- support-methods-arguments: true
- params: countSql
-
-ribbon:
- ReadTimeout: 60000
- ConnectTimeout: 60000
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/application.properties
index 6cbb4ce88..1683f6240 100644
--- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/application.properties
@@ -57,7 +57,7 @@ eureka.client.enabled=false
eureka.client.serviceUrl.registerWithEureka=false
linkis.workspace.filesystem.auto.create=true
-#mybatis-plus.mapper-locations=classpath*:org/apache/linkis/udf/dao/impl/*.xml
+#mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
#mybatis-plus.type-aliases-package=org.apache.linkis.udf.entity
#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml
index 23adfe973..a901a1bf8 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml
+++ b/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml
@@ -28,9 +28,6 @@
<packaging>jar</packaging>
<name>linkis-udf-client</name>
- <properties>
- <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
- </properties>
<dependencies>
<dependency>
@@ -48,41 +45,11 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml
index d04627a24..ca5476f51 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml
+++ b/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml
@@ -28,9 +28,6 @@
<packaging>jar</packaging>
<name>linkis-udf-common</name>
- <properties>
- <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
- </properties>
<dependencies>
<dependency>
@@ -48,41 +45,11 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFDao.xml
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFTreeDao.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFTreeDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFTreeDao.xml
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFTreeDao.xml
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFVersionDao.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFVersionDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFVersionDao.xml
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFVersionDao.xml
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/application.properties b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/application.properties
index 943d6a048..075dafbfb 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/application.properties
@@ -56,7 +56,7 @@ spring.cloud.service-registry.auto-registration.enabled=false
eureka.client.enabled=false
eureka.client.serviceUrl.registerWithEureka=false
-mybatis-plus.mapper-locations=classpath*:org/apache/linkis/udf/dao/impl/*.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org.apache.linkis.udf.entity
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/linkis-public-enhancements/linkis-variable/pom.xml b/linkis-public-enhancements/linkis-variable/pom.xml
index aeaf26dda..ad4e1e7ec 100644
--- a/linkis-public-enhancements/linkis-variable/pom.xml
+++ b/linkis-public-enhancements/linkis-variable/pom.xml
@@ -42,36 +42,11 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/dao/impl/VarMapper.xml b/linkis-public-enhancements/linkis-variable/src/main/resources/mapper/common/VarMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/dao/impl/VarMapper.xml
rename to linkis-public-enhancements/linkis-variable/src/main/resources/mapper/common/VarMapper.xml
diff --git a/linkis-public-enhancements/linkis-variable/src/test/resources/application.properties b/linkis-public-enhancements/linkis-variable/src/test/resources/application.properties
index df58ee9f8..0ad4f1fd4 100644
--- a/linkis-public-enhancements/linkis-variable/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-variable/src/test/resources/application.properties
@@ -56,6 +56,6 @@ spring.cloud.service-registry.auto-registration.enabled=false
eureka.client.enabled=false
eureka.client.serviceUrl.registerWithEureka=false
-mybatis-plus.mapper-locations=classpath:org/apache/linkis/variable/dao/impl/*.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org.apache.linkis.variable.entity
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/linkis-public-enhancements/pom.xml b/linkis-public-enhancements/pom.xml
index 3d007beab..c3eb423cf 100644
--- a/linkis-public-enhancements/pom.xml
+++ b/linkis-public-enhancements/pom.xml
@@ -116,25 +116,7 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -155,11 +137,6 @@
<goal>single</goal>
</goals>
<phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>distribution.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
index 5d81dfb6f..72a57fa25 100644
--- a/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
+++ b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
@@ -89,22 +89,7 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -125,11 +110,6 @@
<goal>single</goal>
</goals>
<phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/distribution.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/pom.xml
index 15e478b03..04118d832 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/pom.xml
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/pom.xml
@@ -69,47 +69,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- <exclude>**/application.yml</exclude>
- <exclude>**/bootstrap.yml</exclude>
- <exclude>**/log4j2.xml</exclude>
- <exclude>**/*.sql</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.yml</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.sh</exclude>
- </excludes>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/main/java/org/apache/linkis/gateway/authentication/dao/impl/TokenMapper.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/main/resources/mapper/common/TokenMapper.xml
similarity index 100%
rename from linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/main/java/org/apache/linkis/gateway/authentication/dao/impl/TokenMapper.xml
rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/main/resources/mapper/common/TokenMapper.xml
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/resources/application.properties b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/resources/application.properties
index 7a6df750f..a90bc282f 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/resources/application.properties
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/resources/application.properties
@@ -56,7 +56,7 @@ spring.cloud.service-registry.auto-registration.enabled=false
eureka.client.enabled=false
eureka.client.serviceUrl.registerWithEureka=false
-mybatis-plus.mapper-locations=classpath*:org/apache/linkis/gateway/authentication/dao/impl/*.xml
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
mybatis-plus.type-aliases-package=org.apache.linkis.gateway.authentication.entity
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/pom.xml
index dad2540de..37f15698a 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/pom.xml
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/pom.xml
@@ -110,34 +110,12 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
+ <plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.yml</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.sh</exclude>
- </excludes>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/pom.xml
index f31fedb8a..ad2a79dae 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/pom.xml
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/pom.xml
@@ -49,26 +49,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml
index 00da3bf3b..79a9a9bc2 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml
@@ -104,38 +104,12 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/scala</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -156,11 +130,6 @@
<goal>single</goal>
</goals>
<phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>/src/main/assembly/distribution.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
index 7ae2ab507..6dec0ef82 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
@@ -87,7 +87,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-reactor-netty</artifactId>
- <version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>io.projectreactor.netty</groupId>
@@ -98,7 +97,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
- <version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -115,26 +113,11 @@
</dependencies>
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org