This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new c9e181c83 STORM-3990 - Hadoop 2.10.2 (#3589)
c9e181c83 is described below
commit c9e181c83855f4b0bae378b94184feb523105734
Author: Richard Zowalla <[email protected]>
AuthorDate: Mon Oct 23 15:21:05 2023 +0200
STORM-3990 - Hadoop 2.10.2 (#3589)
* STORM-3990 - Hadoop 2.10.2
* STORM-3990 - Hadoop 2.10.2
Fix dependency stack related to reload4j after upgrade
---
DEPENDENCY-LICENSES | 47 +++++-----
LICENSE-binary | 46 +++++----
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 | 130 +++++++++++++++++++++++++-
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, 346 insertions(+), 57 deletions(-)
diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES
index 25a23e788..86484a5e5 100644
--- a/DEPENDENCY-LICENSES
+++ b/DEPENDENCY-LICENSES
@@ -66,27 +66,27 @@ List of third-party dependencies grouped by their license
type.
* ApacheDS Protocol Kerberos Codec
(org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15 -
http://directory.apache.org/apacheds/1.5/apacheds-kerberos-codec)
* Apache Geronimo JCache Spec 1.0
(org.apache.geronimo.specs:geronimo-jcache_1.0_spec:1.0-alpha-1 -
http://geronimo.apache.org/maven/specs/geronimo-jcache_1.0_spec/1.0-alpha-1)
* Apache Groovy (org.codehaus.groovy:groovy-all:2.4.4 -
http://groovy-lang.org)
- * Apache Hadoop Annotations
(org.apache.hadoop:hadoop-annotations:2.10.1 - no url defined)
- * Apache Hadoop Archives (org.apache.hadoop:hadoop-archives:2.10.1 -
no url defined)
- * Apache Hadoop Auth (org.apache.hadoop:hadoop-auth:2.10.1 - no url
defined)
- * Apache Hadoop Client (org.apache.hadoop:hadoop-client:2.10.1 - no
url defined)
- * Apache Hadoop Common (org.apache.hadoop:hadoop-common:2.10.1 - no
url defined)
- * Apache Hadoop HDFS (org.apache.hadoop:hadoop-hdfs:2.10.1 - no url
defined)
- * Apache Hadoop HDFS Client
(org.apache.hadoop:hadoop-hdfs-client:2.10.1 - no url defined)
- * Apache Hadoop MapReduce App
(org.apache.hadoop:hadoop-mapreduce-client-app:2.10.1 - no url defined)
- * Apache Hadoop MapReduce Common
(org.apache.hadoop:hadoop-mapreduce-client-common:2.10.1 - no url defined)
- * Apache Hadoop MapReduce Core
(org.apache.hadoop:hadoop-mapreduce-client-core:2.10.1 - no url defined)
- * Apache Hadoop MapReduce JobClient
(org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.10.1 - no url defined)
- * Apache Hadoop MapReduce Shuffle
(org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.10.1 - no url defined)
- * Apache Hadoop YARN API (org.apache.hadoop:hadoop-yarn-api:2.10.1 -
no url defined)
- * Apache Hadoop YARN ApplicationHistoryService
(org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.10.1 - no url
defined)
- * Apache Hadoop YARN Client
(org.apache.hadoop:hadoop-yarn-client:2.10.1 - no url defined)
- * Apache Hadoop YARN Common
(org.apache.hadoop:hadoop-yarn-common:2.10.1 - no url defined)
- * Apache Hadoop YARN NodeManager
(org.apache.hadoop:hadoop-yarn-server-nodemanager:2.10.1 - no url defined)
- * Apache Hadoop YARN Registry
(org.apache.hadoop:hadoop-yarn-registry:2.10.1 - no url defined)
- * Apache Hadoop YARN ResourceManager
(org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.10.1 - no url defined)
- * Apache Hadoop YARN Server Common
(org.apache.hadoop:hadoop-yarn-server-common:2.10.1 - no url defined)
- * Apache Hadoop YARN Web Proxy
(org.apache.hadoop:hadoop-yarn-server-web-proxy:2.10.1 - no url defined)
+ * Apache Hadoop Annotations
(org.apache.hadoop:hadoop-annotations:2.10.2 - no url defined)
+ * Apache Hadoop Archives (org.apache.hadoop:hadoop-archives:2.10.2 -
no url defined)
+ * Apache Hadoop Auth (org.apache.hadoop:hadoop-auth:2.10.2 - no url
defined)
+ * Apache Hadoop Client (org.apache.hadoop:hadoop-client:2.10.2 - no
url defined)
+ * Apache Hadoop Common (org.apache.hadoop:hadoop-common:2.10.2 - no
url defined)
+ * Apache Hadoop HDFS (org.apache.hadoop:hadoop-hdfs:2.10.2 - no url
defined)
+ * Apache Hadoop HDFS Client
(org.apache.hadoop:hadoop-hdfs-client:2.10.2 - no url defined)
+ * Apache Hadoop MapReduce App
(org.apache.hadoop:hadoop-mapreduce-client-app:2.10.2 - no url defined)
+ * Apache Hadoop MapReduce Common
(org.apache.hadoop:hadoop-mapreduce-client-common:2.10.2 - no url defined)
+ * Apache Hadoop MapReduce Core
(org.apache.hadoop:hadoop-mapreduce-client-core:2.10.2 - no url defined)
+ * Apache Hadoop MapReduce JobClient
(org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.10.2 - no url defined)
+ * Apache Hadoop MapReduce Shuffle
(org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.10.2 - no url defined)
+ * Apache Hadoop YARN API (org.apache.hadoop:hadoop-yarn-api:2.10.2 -
no url defined)
+ * Apache Hadoop YARN ApplicationHistoryService
(org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.10.2 - no url
defined)
+ * Apache Hadoop YARN Client
(org.apache.hadoop:hadoop-yarn-client:2.10.2 - no url defined)
+ * Apache Hadoop YARN Common
(org.apache.hadoop:hadoop-yarn-common:2.10.2 - no url defined)
+ * Apache Hadoop YARN NodeManager
(org.apache.hadoop:hadoop-yarn-server-nodemanager:2.10.2 - no url defined)
+ * Apache Hadoop YARN Registry
(org.apache.hadoop:hadoop-yarn-registry:2.10.2 - no url defined)
+ * Apache Hadoop YARN ResourceManager
(org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.10.2 - no url defined)
+ * Apache Hadoop YARN Server Common
(org.apache.hadoop:hadoop-yarn-server-common:2.10.2 - no url defined)
+ * Apache Hadoop YARN Web Proxy
(org.apache.hadoop:hadoop-yarn-server-web-proxy:2.10.2 - no url defined)
* Apache HBase - Annotations (org.apache.hbase:hbase-annotations:2.1.3
- http://hbase.apache.org/hbase-annotations)
* Apache HBase - Client (org.apache.hbase:hbase-client:2.1.3 -
http://hbase.apache.org/hbase-build-configuration/hbase-client)
* Apache HBase - Common (org.apache.hbase:hbase-common:2.1.3 -
http://hbase.apache.org/hbase-build-configuration/hbase-common)
@@ -479,7 +479,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/)
@@ -507,7 +506,7 @@ List of third-party dependencies grouped by their license
type.
* Tephra API (co.cask.tephra:tephra-api:0.6.0 -
https://github.com/caskdata/tephra/tephra-api)
* Tephra Core (co.cask.tephra:tephra-core:0.6.0 -
https://github.com/caskdata/tephra/tephra-core)
* Tephra HBase 1.0 Compatibility
(co.cask.tephra:tephra-hbase-compat-1.0:0.6.0 -
https://github.com/caskdata/tephra/tephra-hbase-compat-1.0)
- * Woodstox (com.fasterxml.woodstox:woodstox-core:5.0.3 -
https://github.com/FasterXML/woodstox)
+ * Woodstox (com.fasterxml.woodstox:woodstox-core:5.3.0 -
https://github.com/FasterXML/woodstox)
* Woodstox (org.codehaus.woodstox:woodstox-core-asl:4.4.1 -
http://woodstox.codehaus.org)
* Xerces2-j (xerces:xercesImpl:2.12.0 -
https://xerces.apache.org/xerces2-j/)
@@ -616,6 +615,7 @@ List of third-party dependencies grouped by their license
type.
* Javolution (javolution:javolution:5.5.1 - http://javolution.org)
* JLine (jline:jline:0.9.94 - http://jline.sourceforge.net)
* Stax2 API (org.codehaus.woodstox:stax2-api:3.1.4 -
http://wiki.fasterxml.com/WoodstoxStax2)
+ * Stax2 API (org.codehaus.woodstox:stax2-api:4.2.1 -
http://github.com/FasterXML/stax2-api)
* xmlenc Library (xmlenc:xmlenc:0.52 - http://xmlenc.sourceforge.net)
CC0 1.0 Universal
@@ -726,7 +726,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 4707ae400..7742e5033 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/)
@@ -729,26 +728,26 @@ The license texts of these dependencies can be found in
the licenses directory.
* ApacheDS I18n (org.apache.directory.server:apacheds-i18n:2.0.0-M15 -
http://directory.apache.org/apacheds/1.5/apacheds-i18n)
* ApacheDS Protocol Kerberos Codec
(org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15 -
http://directory.apache.org/apacheds/1.5/apacheds-kerberos-codec)
* Apache Groovy (org.codehaus.groovy:groovy-all:2.4.4 -
http://groovy-lang.org)
- * Apache Hadoop Archives (org.apache.hadoop:hadoop-archives:2.10.1 -
no url defined)
- * Apache Hadoop Annotations
(org.apache.hadoop:hadoop-annotations:2.10.1 - no url defined)
- * Apache Hadoop Auth (org.apache.hadoop:hadoop-auth:2.10.1 - no url
defined)
- * Apache Hadoop Client (org.apache.hadoop:hadoop-client:2.10.1 - no
url defined)
- * Apache Hadoop Common (org.apache.hadoop:hadoop-common:2.10.1 - no
url defined)
- * Apache Hadoop HDFS (org.apache.hadoop:hadoop-hdfs:2.10.1 - no url
defined)
- * Apache Hadoop HDFS Client
(org.apache.hadoop:hadoop-hdfs-client:2.10.1 - no url defined)
- * Apache Hadoop MapReduce App
(org.apache.hadoop:hadoop-mapreduce-client-app:2.10.1 - no url defined)
- * Apache Hadoop MapReduce Common
(org.apache.hadoop:hadoop-mapreduce-client-common:2.10.1 - no url defined)
- * Apache Hadoop MapReduce Core
(org.apache.hadoop:hadoop-mapreduce-client-core:2.10.1 - no url defined)
- * Apache Hadoop MapReduce JobClient
(org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.10.1 - no url defined)
- * Apache Hadoop MapReduce Shuffle
(org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.10.1 - no url defined)
- * Apache Hadoop YARN API (org.apache.hadoop:hadoop-yarn-api:2.10.1 -
no url defined)
- * Apache Hadoop YARN Client
(org.apache.hadoop:hadoop-yarn-client:2.10.1 - no url defined)
- * Apache Hadoop YARN Common
(org.apache.hadoop:hadoop-yarn-common:2.10.1 - no url defined)
- * Apache Hadoop YARN Server Common
(org.apache.hadoop:hadoop-yarn-server-common:2.10.1 - no url defined)
- * Apache Hadoop YARN ApplicationHistoryService
(org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.10.1 - no url
defined)
- * Apache Hadoop YARN Registry
(org.apache.hadoop:hadoop-yarn-registry:2.10.1 - no url defined)
- * Apache Hadoop YARN ResourceManager
(org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.10.1 - no url defined)
- * Apache Hadoop YARN Web Proxy
(org.apache.hadoop:hadoop-yarn-server-web-proxy:2.10.1 - no url defined)
+ * Apache Hadoop Annotations
(org.apache.hadoop:hadoop-annotations:2.10.2 - no url defined)
+ * Apache Hadoop Archives (org.apache.hadoop:hadoop-archives:2.10.2 -
no url defined)
+ * Apache Hadoop Auth (org.apache.hadoop:hadoop-auth:2.10.2 - no url
defined)
+ * Apache Hadoop Client (org.apache.hadoop:hadoop-client:2.10.2 - no
url defined)
+ * Apache Hadoop Common (org.apache.hadoop:hadoop-common:2.10.2 - no
url defined)
+ * Apache Hadoop HDFS (org.apache.hadoop:hadoop-hdfs:2.10.2 - no url
defined)
+ * Apache Hadoop HDFS Client
(org.apache.hadoop:hadoop-hdfs-client:2.10.2 - no url defined)
+ * Apache Hadoop MapReduce App
(org.apache.hadoop:hadoop-mapreduce-client-app:2.10.2 - no url defined)
+ * Apache Hadoop MapReduce Common
(org.apache.hadoop:hadoop-mapreduce-client-common:2.10.2 - no url defined)
+ * Apache Hadoop MapReduce Core
(org.apache.hadoop:hadoop-mapreduce-client-core:2.10.2 - no url defined)
+ * Apache Hadoop MapReduce JobClient
(org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.10.2 - no url defined)
+ * Apache Hadoop MapReduce Shuffle
(org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.10.2 - no url defined)
+ * Apache Hadoop YARN API (org.apache.hadoop:hadoop-yarn-api:2.10.2 -
no url defined)
+ * Apache Hadoop YARN ApplicationHistoryService
(org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.10.2 - no url
defined)
+ * Apache Hadoop YARN Client
(org.apache.hadoop:hadoop-yarn-client:2.10.2 - no url defined)
+ * Apache Hadoop YARN Common
(org.apache.hadoop:hadoop-yarn-common:2.10.2 - no url defined)
+ * Apache Hadoop YARN Registry
(org.apache.hadoop:hadoop-yarn-registry:2.10.2 - no url defined)
+ * Apache Hadoop YARN ResourceManager
(org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.10.2 - no url defined)
+ * Apache Hadoop YARN Server Common
(org.apache.hadoop:hadoop-yarn-server-common:2.10.2 - no url defined)
+ * Apache Hadoop YARN Web Proxy
(org.apache.hadoop:hadoop-yarn-server-web-proxy:2.10.2 - no url defined)
* Apache HBase - Annotations (org.apache.hbase:hbase-annotations:2.1.3
- http://hbase.apache.org/hbase-annotations)
* Apache HBase - Client (org.apache.hbase:hbase-client:2.1.3 -
http://hbase.apache.org/hbase-build-configuration/hbase-client)
* Apache HBase - Common (org.apache.hbase:hbase-common:2.1.3 -
http://hbase.apache.org/hbase-build-configuration/hbase-common)
@@ -946,7 +945,7 @@ The license texts of these dependencies can be found in the
licenses directory.
* Xml Compatibility extensions for Jackson
(org.codehaus.jackson:jackson-xc:1.9.13 - http://jackson.codehaus.org)
* RocksDB JNI (org.rocksdb:rocksdbjni:8.1.1 - https://rocksdb.org)
* JCTools Core (org.jctools:jctools-core:2.0.1 -
http://jctools.github.io/JCTools/)
- * Woodstox (com.fasterxml.woodstox:woodstox-core:5.0.3 -
https://github.com/FasterXML/woodstox)
+ * Woodstox (com.fasterxml.woodstox:woodstox-core:5.3.0 -
https://github.com/FasterXML/woodstox)
Apache License, Version 2.0, BSD 2-Clause, Eclipse Distribution License,
Version 1.0, Eclipse Public License, Version 2.0, jQuery license, MIT License,
Modified BSD, Public Domain, The GNU General Public License (GPL), Version 2,
With Classpath Exception, W3C license
@@ -981,7 +980,7 @@ The license texts of these dependencies can be found in the
licenses directory.
* leveldbjni-all (org.fusesource.leveldbjni:leveldbjni-all:1.8 -
http://leveldbjni.fusesource.org/leveldbjni-all)
* ANTLR 3 Runtime (org.antlr:antlr-runtime:3.5.2 -
http://www.antlr.org)
* ANTLR ST4 4.0.4 (org.antlr:ST4:4.0.4 - http://www.stringtemplate.org)
- * Stax2 API (org.codehaus.woodstox:stax2-api:3.1.4 -
http://wiki.fasterxml.com/WoodstoxStax2)
+ * Stax2 API (org.codehaus.woodstox:stax2-api:4.2.1 -
http://wiki.fasterxml.com/WoodstoxStax2)
* xmlenc Library (xmlenc:xmlenc:0.52 - http://xmlenc.sourceforge.net)
* Commons Compiler (org.codehaus.janino:commons-compiler:2.7.6 -
http://docs.codehaus.org/display/JANINO/Home/commons-compiler)
* Janino (org.codehaus.janino:janino:2.7.6 -
http://docs.codehaus.org/display/JANINO/Home/janino)
@@ -1070,7 +1069,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 cee417388..2d0e90cb2 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>
<exclusion>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
diff --git a/external/storm-hdfs-blobstore/pom.xml
b/external/storm-hdfs-blobstore/pom.xml
index 49e15733e..cc45f6739 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>
<exclusion>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
@@ -199,6 +215,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>
@@ -211,6 +235,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>
@@ -225,6 +257,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 a2353e5c9..582b4e1e4 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>
<exclusion>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
@@ -189,14 +213,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>
@@ -220,6 +248,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>
@@ -236,6 +273,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 71da5758b..4a36cbc23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<snappy.version>1.1.10.4</snappy.version>
<jline.version>0.9.94</jline.version>
<hive.version>2.3.9</hive.version>
- <hadoop.version>2.10.1</hadoop.version>
+ <hadoop.version>2.10.2</hadoop.version>
<hdfs.version>${hadoop.version}</hdfs.version>
<hbase.version>2.1.3</hbase.version>
<kryo.version>5.4.0</kryo.version>
@@ -662,6 +662,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
@@ -804,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>
@@ -884,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>
@@ -961,16 +981,46 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<version>${hadoop.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.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop.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.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.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.hadoop</groupId>
@@ -981,36 +1031,114 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <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>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
<version>${hadoop.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.hadoop</groupId>
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
<version>${hadoop.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.hadoop</groupId>
<artifactId>hadoop-yarn-server-applicationhistoryservice</artifactId>
<version>${hadoop.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.hadoop</groupId>
<artifactId>hadoop-yarn-server-web-proxy</artifactId>
<version>${hadoop.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.hadoop</groupId>
<artifactId>hadoop-yarn-registry</artifactId>
<version>${hadoop.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.hadoop</groupId>
<artifactId>hadoop-archives</artifactId>
<version>${hadoop.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.httpcomponents</groupId>
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 f583545a5..da617dabb 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>
