Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions linkis-commons/linkis-module/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,11 @@
<artifactId>spring-retry</artifactId>
<version>1.3.4</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
13 changes: 13 additions & 0 deletions linkis-dist/package/conf/application-engineconn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,24 @@
spring:
application:
name: linkis-cg-engineconn
main:
allow-bean-definition-overriding: true
# Spring Boot 2.7+ compatibility: required for springfox 3.0.0 + Linkis internal bean cycles
allow-circular-references: true
mvc:
pathmatch:
matching-strategy: ant_path_matcher
servlet:
path: /api/rest_j/v1
servlet:
multipart:
max-file-size: 500MB
max-request-size: 500MB
file-size-threshold: 50MB
cloud:
loadbalancer:
cache:
enabled: false
eureka:
instance:
# prefer-ip-address: true
Expand Down
17 changes: 17 additions & 0 deletions linkis-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,23 @@
<artifactId>commons-beanutils</artifactId>
</dependency>

<!-- 显式引入正确的 scala/hadoop 依赖,覆盖传递依赖中的错误版本 -->
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_2.12</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
<version>${hadoop.version}</version>
</dependency>
<!-- Eureka Client 依赖 commons-lang 2.x 的 ExceptionUtils -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>

</dependencies>

<build>
Expand Down
2 changes: 2 additions & 0 deletions linkis-dist/src/main/assembly/distribution.xml
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,8 @@
<useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>com.fasterxml.jackson.module:jackson-module-scala_2.11:*</exclude>
<exclude>org.apache.hadoop:hadoop-hdfs:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
Expand Down
8 changes: 8 additions & 0 deletions linkis-engineconn-plugins/impala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@
<version>${libthrift.version}</version>
</dependency>

<!-- slf4j-api must be declared explicitly because both linkis-common (provided) and
impala-* artifacts (all transitive deps excluded) do not bring it in.
Required by Logging.logger and Utils.tryAndWarn implicit parameter. -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<!-- impala -->
<dependency>
<groupId>org.apache.impala</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,13 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
Expand Down
Loading