This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 5514d871799 Resolve conflict for commons-logging (#28810)
5514d871799 is described below
commit 5514d871799d7482b1c52c4ca2fc3ec5b369714f
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Oct 20 10:07:32 2023 +0800
Resolve conflict for commons-logging (#28810)
---
pom.xml | 63 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 32 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 87232dac3cd..f8b0915eb27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,7 @@
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.12</logback.version>
+ <commons-logging.version>1.2</commons-logging.version>
<lombok.version>1.18.30</lombok.version>
@@ -212,6 +213,11 @@
<artifactId>transmittable-thread-local</artifactId>
<version>${transmittable-thread-local.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.github.ben-manes.caffeine</groupId>
+ <artifactId>caffeine</artifactId>
+ <version>${caffeine.version}</version>
+ </dependency>
<dependency>
<groupId>org.yaml</groupId>
@@ -280,6 +286,12 @@
<version>${activation-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>${freemarker.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
@@ -508,6 +520,13 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -581,18 +600,6 @@
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- <version>${bytebuddy.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy-agent</artifactId>
- <version>${bytebuddy.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-bom</artifactId>
@@ -616,6 +623,12 @@
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>${awaitility.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.curator</groupId>
@@ -629,30 +642,18 @@
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
</dependency>
<dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- <version>${caffeine.version}</version>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>${bytebuddy.version}</version>
+ <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>${awaitility.version}</version>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ <version>${bytebuddy.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
