This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch STORM-4001-log4j2-2.21.1
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/STORM-4001-log4j2-2.21.1 by
this push:
new a3a73b7ac STORM-4001 - log4j2 2.21.1 - Fix dependency tree
a3a73b7ac is described below
commit a3a73b7ac95c15245fa27b15809d164ee42a9ecf
Author: Richard Zowalla <[email protected]>
AuthorDate: Tue Nov 14 10:13:40 2023 +0100
STORM-4001 - log4j2 2.21.1 - Fix dependency tree
---
DEPENDENCY-LICENSES | 10 +++++-----
external/storm-autocreds/pom.xml | 8 ++++++++
external/storm-hive/pom.xml | 18 +++++++++++++++++-
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES
index 79f1a5b44..87892a602 100644
--- a/DEPENDENCY-LICENSES
+++ b/DEPENDENCY-LICENSES
@@ -21,6 +21,11 @@ List of third-party dependencies grouped by their license
type.
* Apache Directory LDAP API I18n
(org.apache.directory.api:api-i18n:2.1.4 -
https://directory.apache.org/api-parent/api-i18n/)
* Apache Directory LDAP API Model
(org.apache.directory.api:api-ldap-model:2.1.4 -
https://directory.apache.org/api-parent/api-ldap-parent/api-ldap-model/)
* Apache Directory LDAP API Utilities
(org.apache.directory.api:api-util:2.1.4 -
https://directory.apache.org/api-parent/api-util/)
+ * Apache Log4j 1.x Compatibility API
(org.apache.logging.log4j:log4j-1.2-api:2.21.1 -
https://logging.apache.org/log4j/2.x/log4j/log4j-1.2-api/)
+ * Apache Log4j API (org.apache.logging.log4j:log4j-api:2.21.1 -
https://logging.apache.org/log4j/2.x/log4j/log4j-api/)
+ * Apache Log4j Core (org.apache.logging.log4j:log4j-core:2.21.1 -
https://logging.apache.org/log4j/2.x/log4j/log4j-core/)
+ * Apache Log4j SLF4J Binding
(org.apache.logging.log4j:log4j-slf4j-impl:2.21.1 -
https://logging.apache.org/log4j/2.x/log4j/log4j-slf4j-impl/)
+ * Apache Log4j Web (org.apache.logging.log4j:log4j-web:2.21.1 -
https://logging.apache.org/log4j/2.x/log4j/log4j-web/)
* Gson (com.google.code.gson:gson:2.8.9 -
https://github.com/google/gson/gson)
* Gson (com.google.code.gson:gson:2.9.0 -
https://github.com/google/gson/gson)
* Maven Plugin Tools Java Annotations
(org.apache.maven.plugin-tools:maven-plugin-annotations:3.8.1 -
https://maven.apache.org/plugin-tools/maven-plugin-annotations)
@@ -123,11 +128,6 @@ List of third-party dependencies grouped by their license
type.
* Apache HttpCore NIO (org.apache.httpcomponents:httpcore-nio:4.4.5 -
http://hc.apache.org/httpcomponents-core-ga)
* Apache Ivy (org.apache.ivy:ivy:2.4.0 - http://ant.apache.org/ivy/)
* Apache Kafka (org.apache.kafka:kafka-clients:0.11.0.3 -
http://kafka.apache.org)
- * Apache Log4j 1.x Compatibility API
(org.apache.logging.log4j:log4j-1.2-api:2.21.1 -
https://logging.apache.org/log4j/2.x/log4j-1.2-api/)
- * Apache Log4j API (org.apache.logging.log4j:log4j-api:2.21.1 -
https://logging.apache.org/log4j/2.x/log4j-api/)
- * Apache Log4j Core (org.apache.logging.log4j:log4j-core:2.21.1 -
https://logging.apache.org/log4j/2.x/log4j-core/)
- * Apache Log4j SLF4J Binding
(org.apache.logging.log4j:log4j-slf4j-impl:2.21.1 -
https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/)
- * Apache Log4j Web (org.apache.logging.log4j:log4j-web:2.21.1 -
https://logging.apache.org/log4j/2.x/log4j-web/)
* Apache Maven Artifact Transfer
(org.apache.maven.shared:maven-artifact-transfer:0.9.1 -
https://maven.apache.org/shared/maven-artifact-transfer/)
* Apache Maven Common Artifact Filters
(org.apache.maven.shared:maven-common-artifact-filters:3.0.1 -
https://maven.apache.org/shared/maven-common-artifact-filters/)
* Apache Maven Dependency Tree
(org.apache.maven.shared:maven-dependency-tree:2.2 -
http://maven.apache.org/shared/maven-dependency-tree/)
diff --git a/external/storm-autocreds/pom.xml b/external/storm-autocreds/pom.xml
index 813d072ab..145b3f8ee 100644
--- a/external/storm-autocreds/pom.xml
+++ b/external/storm-autocreds/pom.xml
@@ -220,6 +220,14 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-cli</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/external/storm-hive/pom.xml b/external/storm-hive/pom.xml
index 75d7e61e8..f534ef8b4 100644
--- a/external/storm-hive/pom.xml
+++ b/external/storm-hive/pom.xml
@@ -89,7 +89,15 @@
</exclusion>
<exclusion>
<groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -127,6 +135,14 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
