center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #9348 from dataease/pr@dev-v2@perf_guava

Browse Source 
perf(X-Pack): guava依赖冲突
This commit is contained in:
fit2cloud-chenyw 2024-04-25 17:18:09 +08:00 committed by GitHub
commit 853680a18d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
core/core-backend/pom.xml
View File

@ -13,6 +13,27 @@
<artifactId>core-backend</artifactId>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>${selenium-java.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
<version>${angus-mail.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>api-base</artifactId>
@ -37,6 +58,12 @@
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<version>${calcite-core.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
<classifier>de</classifier>
</dependency>
<dependency>
@ -97,22 +124,6 @@
</properties>
<dependencies>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>${selenium-java.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
<version>${angus-mail.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@ -135,7 +146,7 @@
</filesets>
</configuration>
</plugin>
<plugin>
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@ -156,7 +167,7 @@
</goals>
</execution>
</executions>
</plugin>
</plugin>-->
</plugins>
</build>
</profile>
@ -287,7 +298,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<finalName>CoreApplication</finalName>
<!--<finalName>CoreApplication</finalName>-->
<layout>ZIP</layout>
</configuration>
<executions>

2
de-xpack

@ -1 +1 @@
Subproject commit 050cb80be097d53c4bef0b5e6abd4162cd9b1676
Subproject commit b47df7a291dd595400397c3e089037cc41658ad7

8
pom.xml
View File

@ -42,9 +42,10 @@
<flatten-maven.version>1.3.0</flatten-maven.version>
<maven.resources.version>3.3.1</maven.resources.version>
<maven.exec.version>3.1.0</maven.exec.version>
<guava.version>31.1-jre</guava.version>
<guava.version>33.0.0-jre</guava.version>
<selenium-java.version>4.19.1</selenium-java.version>
<angus-mail.version>2.0.3</angus-mail.version>
<mysql-connector-j.version>8.2.0</mysql-connector-j.version>
</properties>
<dependencyManagement>
@ -109,6 +110,11 @@
<artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql-connector-j.version}</version>
</dependency>
</dependencies>