Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Feature][linkis-public-enhancements] merge pes common module #4848

Closed
wants to merge 3 commits into from
Closed

[Feature][linkis-public-enhancements] merge pes common module #4848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bafafe
1、upgrade commons lang2->commons lang3
GuoPhilipse Jul 2, 2023
db8676c
1、upgrade commons lang2->commons lang3
GuoPhilipse Jul 2, 2023
80175eb
add license
GuoPhilipse Jul 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ger-server/src/main/java/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.ReversedLinesFileReader;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Triple;

import java.io.File;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.commons.lang3.tuple.MutablePair;

import org.springframework.beans.factory.annotation.Autowired;
Expand Down
2 changes: 1 addition & 1 deletion ...-manager/src/main/java/org/apache/linkis/manager/rm/service/impl/UserResourceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.apache.linkis.server.BDPJettyServerHelper;

import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
Expand Down
2 changes: 1 addition & 1 deletion ...che/linkis/engineplugin/elasticsearch/executor/client/impl/ElasticSearchExecutorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.linkis.protocol.constants.TaskConstant;
import org.apache.linkis.storage.utils.StorageUtils;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import java.util.Locale;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/linkis/engineplugin/impala/client/thrift/ImpalaThriftClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.apache.linkis.engineplugin.impala.client.protocol.ExecSummary;
import org.apache.linkis.engineplugin.impala.client.util.ThriftUtil;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.hive.service.rpc.thrift.TExecuteStatementReq;
import org.apache.hive.service.rpc.thrift.TExecuteStatementResp;
import org.apache.hive.service.rpc.thrift.TOperationHandle;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkDataCalcExecutor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import org.apache.linkis.scheduler.executer.{
SuccessExecuteResponse
}

import org.apache.commons.lang.exception.ExceptionUtils
import org.apache.commons.lang3.exception.ExceptionUtils

import java.lang.reflect.InvocationTargetException

Expand Down
2 changes: 1 addition & 1 deletion linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-bml-common</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
43 changes: 0 additions & 43 deletions linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-bml-common</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion linkis-public-enhancements/linkis-bml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

<packaging>pom</packaging>
<modules>
<module>linkis-bml-common</module>
<module>linkis-bml-server</module>
<module>linkis-bml-client</module>
</modules>
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/apache/linkis/configuration/restful/api/TenantConfigrationRestfulApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.apache.linkis.server.Message;
import org.apache.linkis.server.utils.ModuleUserUtils;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.apache.linkis.server.Message;
import org.apache.linkis.server.utils.ModuleUserUtils;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
Expand Down
2 changes: 1 addition & 1 deletion ...n/src/main/java/org/apache/linkis/configuration/service/impl/TenantConfigServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.apache.linkis.governance.common.constant.job.JobRequestConstants;

import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
Expand Down
2 changes: 1 addition & 1 deletion ...n/src/main/java/org/apache/linkis/configuration/service/impl/UserIpConfigServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.linkis.configuration.util.CommonUtils;
import org.apache.linkis.governance.common.constant.job.JobRequestConstants;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
Expand Down
2 changes: 1 addition & 1 deletion linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cs-listener</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
45 changes: 0 additions & 45 deletions linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cs-common</artifactId>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cs-listener need to merge to pes common

<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
8 changes: 1 addition & 7 deletions linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cs-common</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -39,12 +39,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cs-listener</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-instance-label-client</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions linkis-public-enhancements/linkis-context-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@

<modules>

<module>linkis-cs-common</module>
<module>linkis-cs-listener</module>
<module>linkis-cs-client</module>
<module>linkis-cs-server</module>

Expand Down
8 changes: 1 addition & 7 deletions linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-datasource-manager-common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-metadata-query-common</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
55 changes: 0 additions & 55 deletions linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<!-- data source manager common dependency-->
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-datasource-manager-common</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -91,12 +91,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<!--Metadata common-->
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-metadata-query-common</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
8 changes: 1 addition & 7 deletions linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,10 @@
<artifactId>linkis-metadata-query-server</artifactId>

<dependencies>
<!--Metadata common-->
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-metadata-query-common</artifactId>
<version>${project.version}</version>
</dependency>
<!-- data source manager common dependency-->
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-datasource-manager-common</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand Down
2 changes: 1 addition & 1 deletion ...public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-metadata-query-common</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-metadata-query-common</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-metadata-query-common</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
Loading
Loading