This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch STORM-3990_Hadoop_2.10.2
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/STORM-3990_Hadoop_2.10.2 by
this push:
new e5d17755c STORM-3990 - Hadoop 2.10.2 Fix dependency stack related to
reload4j after upgrade
e5d17755c is described below
commit e5d17755c0db59ec35147dd34637c388c8360718
Author: Richard Zowalla <[email protected]>
AuthorDate: Thu Oct 19 12:54:23 2023 +0200
STORM-3990 - Hadoop 2.10.2
Fix dependency stack related to reload4j after upgrade
---
DEPENDENCY-LICENSES | 2 -
LICENSE-binary | 2 -
external/storm-autocreds/pom.xml | 8 ++++
external/storm-blobstore-migration/pom.xml | 33 ++++++++++++++
external/storm-hdfs-blobstore/pom.xml | 42 ++++++++++++++++++
external/storm-hdfs/pom.xml | 53 ++++++++++++++++++++--
external/storm-hive/pom.xml | 16 +++++++
external/storm-kafka-monitor/pom.xml | 4 --
pom.xml | 64 +++++++++++++++++++++++++++
sql/storm-sql-core/pom.xml | 8 ++++
sql/storm-sql-external/storm-sql-hdfs/pom.xml | 8 ++++
sql/storm-sql-runtime/pom.xml | 8 ++++
12 files changed, 236 insertions(+), 12 deletions(-)
diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES
index d91015329..89e4fcec2 100644
--- a/DEPENDENCY-LICENSES
+++ b/DEPENDENCY-LICENSES
@@ -480,7 +480,6 @@ List of third-party dependencies grouped by their license
type.
* Plexus Security Dispatcher Component
(org.sonatype.plexus:plexus-sec-dispatcher:1.3 -
http://spice.sonatype.org/plexus-sec-dispatcher)
* Plexus Security Dispatcher Component
(org.sonatype.plexus:plexus-sec-dispatcher:1.4 -
http://spice.sonatype.org/plexus-sec-dispatcher)
* Proton-J (org.apache.qpid:proton-j:0.18.0 -
http://qpid.apache.org/proton/proton-j)
- * reload4j (ch.qos.reload4j:reload4j:1.2.19 - https://reload4j.qos.ch)
* rest (org.elasticsearch.client:rest:5.2.2 -
https://github.com/elastic/elasticsearch)
* rocketmq-client 4.2.0 (org.apache.rocketmq:rocketmq-client:4.2.0 -
http://rocketmq.apache.org/rocketmq-client/)
* rocketmq-common 4.2.0 (org.apache.rocketmq:rocketmq-common:4.2.0 -
http://rocketmq.apache.org/rocketmq-common/)
@@ -730,7 +729,6 @@ List of third-party dependencies grouped by their license
type.
* JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.36 -
http://www.slf4j.org)
* Microsoft JDBC Driver for SQL Server
(com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7 -
https://github.com/Microsoft/mssql-jdbc)
* SLF4J API Module (org.slf4j:slf4j-api:1.7.36 - http://www.slf4j.org)
- * SLF4J Reload4j Binding (org.slf4j:slf4j-reload4j:1.7.36 -
http://reload4j.qos.ch)
* System Out and Err redirected to SLF4J
(uk.org.lidalia:sysout-over-slf4j:1.0.2 -
http://projects.lidalia.org.uk/sysout-over-slf4j/)
Mozilla Public License Version 1.1
diff --git a/LICENSE-binary b/LICENSE-binary
index 41b4049e7..8001f69ab 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -650,7 +650,6 @@ The license texts of these dependencies can be found in the
licenses directory.
Apache License, Version 2.0
- * reload4j (ch.qos.reload4j:reload4j:1.2.19 - https://reload4j.qos.ch)
* Plexus Common Utilities (org.codehaus.plexus:plexus-utils:3.1.0 -
http://codehaus-plexus.github.io/plexus-utils/)
* Maven Artifact (org.apache.maven:maven-artifact:3.6.0 -
https://maven.apache.org/ref/3.6.0/maven-artifact/)
* Maven Builder Support (org.apache.maven:maven-builder-support:3.6.0
- https://maven.apache.org/ref/3.6.0/maven-builder-support/)
@@ -1071,7 +1070,6 @@ The license texts of these dependencies can be found in
the licenses directory.
* JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.36 -
http://www.slf4j.org)
* SLF4J API Module (org.slf4j:slf4j-api:1.7.36 - http://www.slf4j.org)
* Sysout over SLF4J (uk.org.lidalia:sysout-over-slf4j:1.0.2 -
http://projects.lidalia.org.uk/sysout-over-slf4j/)
- * SLF4J Reload4j Binding (org.slf4j:slf4j-reload4j:1.7.36 -
http://reload4j.qos.ch)
Mozilla Public License Version 2.0
diff --git a/external/storm-autocreds/pom.xml b/external/storm-autocreds/pom.xml
index 7a1676f0e..813d072ab 100644
--- a/external/storm-autocreds/pom.xml
+++ b/external/storm-autocreds/pom.xml
@@ -94,6 +94,14 @@
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/external/storm-blobstore-migration/pom.xml
b/external/storm-blobstore-migration/pom.xml
index 0ec323b6e..60ae62873 100644
--- a/external/storm-blobstore-migration/pom.xml
+++ b/external/storm-blobstore-migration/pom.xml
@@ -48,6 +48,15 @@ limitations under the License.
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
+
</exclusions>
</dependency>
<dependency>
@@ -72,6 +81,14 @@ limitations under the License.
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -83,6 +100,14 @@ limitations under the License.
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -94,6 +119,14 @@ limitations under the License.
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/external/storm-hdfs-blobstore/pom.xml
b/external/storm-hdfs-blobstore/pom.xml
index 04d93923b..ad7a23c83 100644
--- a/external/storm-hdfs-blobstore/pom.xml
+++ b/external/storm-hdfs-blobstore/pom.xml
@@ -124,6 +124,14 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -176,6 +184,14 @@
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -191,6 +207,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
<scope>test</scope>
</dependency>
@@ -203,6 +227,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
<type>test-jar</type>
<scope>test</scope>
@@ -217,6 +249,16 @@
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index ef0b27b35..23d1240cc 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -96,6 +96,14 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -115,6 +123,14 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -130,6 +146,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -181,14 +205,18 @@
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-kerberos-codec</artifactId>
</exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -212,6 +240,15 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
+
</exclusions>
<scope>test</scope>
</dependency>
@@ -228,6 +265,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/external/storm-hive/pom.xml b/external/storm-hive/pom.xml
index 9db71b0d7..e845d03f0 100644
--- a/external/storm-hive/pom.xml
+++ b/external/storm-hive/pom.xml
@@ -177,6 +177,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -196,6 +204,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/external/storm-kafka-monitor/pom.xml
b/external/storm-kafka-monitor/pom.xml
index c8abab396..3cfa6dd41 100644
--- a/external/storm-kafka-monitor/pom.xml
+++ b/external/storm-kafka-monitor/pom.xml
@@ -46,10 +46,6 @@
<artifactId>kafka-clients</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
diff --git a/pom.xml b/pom.xml
index 987b50136..0542b3389 100644
--- a/pom.xml
+++ b/pom.xml
@@ -808,6 +808,12 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -888,6 +894,16 @@
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<version>${calcite.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
@@ -970,6 +986,10 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -981,6 +1001,10 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -992,6 +1016,10 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1008,6 +1036,18 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1019,6 +1059,10 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1030,6 +1074,10 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1041,6 +1089,10 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1052,6 +1104,10 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1063,6 +1119,10 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1074,6 +1134,10 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/sql/storm-sql-core/pom.xml b/sql/storm-sql-core/pom.xml
index 69e2de71e..3625f9412 100644
--- a/sql/storm-sql-core/pom.xml
+++ b/sql/storm-sql-core/pom.xml
@@ -105,6 +105,14 @@
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/sql/storm-sql-external/storm-sql-hdfs/pom.xml
b/sql/storm-sql-external/storm-sql-hdfs/pom.xml
index 435b24788..4207a1fb9 100644
--- a/sql/storm-sql-external/storm-sql-hdfs/pom.xml
+++ b/sql/storm-sql-external/storm-sql-hdfs/pom.xml
@@ -87,6 +87,14 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
<scope>test</scope>
</dependency>
diff --git a/sql/storm-sql-runtime/pom.xml b/sql/storm-sql-runtime/pom.xml
index 101e562d6..9e0bab564 100644
--- a/sql/storm-sql-runtime/pom.xml
+++ b/sql/storm-sql-runtime/pom.xml
@@ -92,6 +92,14 @@
<groupId>org.pentaho</groupId>
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
