You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2023/04/13 16:29:53 UTC
[ozone] branch master updated: HDDS-8357. Exclude spring-jcl to avoid dependency conflict (#4544)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 67f46e031e HDDS-8357. Exclude spring-jcl to avoid dependency conflict (#4544)
67f46e031e is described below
commit 67f46e031ebc1d220e800a79099b1885370d6d72
Author: okumin <gi...@okumin.com>
AuthorDate: Fri Apr 14 01:29:47 2023 +0900
HDDS-8357. Exclude spring-jcl to avoid dependency conflict (#4544)
---
hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 1 -
hadoop-ozone/dist/src/main/license/jar-report.txt | 1 -
hadoop-ozone/recon-codegen/pom.xml | 6 ++++++
hadoop-ozone/recon/pom.xml | 6 ++++++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index 58ea919399..2e8ce98c57 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -442,7 +442,6 @@ Apache License 2.0
org.rocksdb:rocksdbjni
org.springframework:spring-beans
org.springframework:spring-core
- org.springframework:spring-jcl
org.springframework:spring-jdbc
org.springframework:spring-tx
org.xerial.snappy:snappy-java
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt
index abf685fb12..5268bc1fbf 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -253,7 +253,6 @@ share/ozone/lib/snakeyaml.jar
share/ozone/lib/snappy-java.jar
share/ozone/lib/spring-beans.jar
share/ozone/lib/spring-core.jar
-share/ozone/lib/spring-jcl.jar
share/ozone/lib/spring-jdbc.jar
share/ozone/lib/spring-tx.jar
share/ozone/lib/sqlite-jdbc.jar
diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml
index 3a6d06ec08..67c8b0facf 100644
--- a/hadoop-ozone/recon-codegen/pom.xml
+++ b/hadoop-ozone/recon-codegen/pom.xml
@@ -40,6 +40,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jcl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jooq</groupId>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 6f6755d326..9e85075693 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -339,6 +339,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jcl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org