dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf(X-Pack): guava依赖冲突

Browse Source
This commit is contained in:
fit2cloud-chenyw 2024-04-25 17:14:14 +08:00
parent d39ab7d448
commit d79aa18422
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> <artifactId>core-backend</artifactId>
<dependencies> <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> <dependency>
<groupId>io.dataease</groupId> <groupId>io.dataease</groupId>
<artifactId>api-base</artifactId> <artifactId>api-base</artifactId>
@ -37,6 +58,12 @@
<groupId>org.apache.calcite</groupId> <groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId> <artifactId>calcite-core</artifactId>
<version>${calcite-core.version}</version> <version>${calcite-core.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
<classifier>de</classifier> <classifier>de</classifier>
</dependency> </dependency>
<dependency> <dependency>
@ -97,22 +124,6 @@
</properties> </properties>
<dependencies> <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> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
@ -135,7 +146,7 @@
</filesets> </filesets>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <!--<plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>
@ -156,7 +167,7 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>-->
</plugins> </plugins>
</build> </build>
</profile> </profile>
@ -287,7 +298,7 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration> <configuration>
<finalName>CoreApplication</finalName> <!--<finalName>CoreApplication</finalName>-->
<layout>ZIP</layout> <layout>ZIP</layout>
</configuration> </configuration>
<executions> <executions>

2
de-xpack

@ -1 +1 @@
Subproject commit 188b57250c4220e1972ee15da0bf416d6ce3e1fc Subproject commit b47df7a291dd595400397c3e089037cc41658ad7

8
pom.xml
View File

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