Skip to content

Commit

Permalink
Merge pull request #772 from tballison/NUTCH-2978
Browse files Browse the repository at this point in the history
NUTCH-2978 -- upgrade to log4j2 throughout
  • Loading branch information
tballison authored Sep 17, 2023
2 parents 0ad935f + 56fdbbe commit d81be51
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 22 deletions.
2 changes: 0 additions & 2 deletions LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ This product bundles some components that are also licensed under
the Apache License Version 2.0:


ch.qos.reload4j:reload4j
com.101tec:zkclient
com.amazonaws:aws-java-sdk-cloudsearch
com.amazonaws:aws-java-sdk-core
Expand Down Expand Up @@ -753,7 +752,6 @@ org.jsoup:jsoup
org.rypt:f8
org.slf4j:jcl-over-slf4j
org.slf4j:slf4j-api
org.slf4j:slf4j-reload4j


Mozilla Public License 1.1 (MPL 1.1)
Expand Down
8 changes: 0 additions & 8 deletions NOTICE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,6 @@ AOP alliance (http://aopalliance.sourceforge.net)
- license: Public Domain
(licenses-binary/LICENSE-public-domain.txt)

# ch.qos.reload4j:reload4j
reload4j (https://reload4j.qos.ch)
- license: The Apache Software License, Version 2.0

# com.101tec:zkclient
ZkClient (https://github.com/sgroschupf/zkclient)
- license: The Apache Software License, Version 2.0
Expand Down Expand Up @@ -1097,10 +1093,6 @@ JCL 1.2 implemented over SLF4J (http://www.slf4j.org)
(licenses-binary/LICENSE-mit-license.txt)
# org.slf4j:slf4j-api
SLF4J API Module (http://www.slf4j.org)
- license: MIT License
(licenses-binary/LICENSE-mit-license.txt)
# org.slf4j:slf4j-reload4j
SLF4J Reload4j Binding (http://reload4j.qos.ch)
- license: MIT License
(licenses-binary/LICENSE-mit-license.txt)

Expand Down
34 changes: 24 additions & 10 deletions ivy/ivy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
</publications>

<dependencies>
<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.18.0" conf="*->master" />
<dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.18.0" conf="*->master" />
<dependency org="org.apache.logging.log4j" name="log4j-slf4j-impl" rev="2.18.0" conf="*->master" />
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.36" conf="*->master" />
<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.20.0" conf="*->master" />
<dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.20.0" conf="*->master" />
<dependency org="org.apache.logging.log4j" name="log4j-slf4j2-impl" rev="2.20.0" conf="*->master" />
<dependency org="org.slf4j" name="slf4j-api" rev="2.0.7" conf="*->master" />

<dependency org="org.apache.commons" name="commons-lang3" rev="3.12.0" conf="*->default" />
<dependency org="org.apache.commons" name="commons-collections4" rev="4.4" conf="*->master" />
Expand All @@ -50,11 +50,22 @@
<dependency org="com.tdunning" name="t-digest" rev="3.3" />

<!-- Hadoop Dependencies -->
<dependency org="org.apache.hadoop" name="hadoop-common" rev="3.3.4" conf="*->default" />
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="3.3.4" conf="*->default" />
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" rev="3.3.4" conf="*->default" />
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient" rev="3.3.4" conf="*->default" />
<!-- End of Hadoop Dependencies -->
<dependency org="org.apache.hadoop" name="hadoop-common" rev="3.3.4" conf="*->default">
<exclude org="ch.qos.reload4j" name="*"/>
<exclude org="org.slf4j" name="*" />
</dependency>
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="3.3.4" conf="*->default">
<exclude org="ch.qos.reload4j" name="*"/>
<exclude org="org.slf4j" name="*" />
</dependency>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" rev="3.3.4" conf="*->default">
<exclude org="ch.qos.reload4j" name="*"/>
<exclude org="org.slf4j" name="*" />
</dependency>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient" rev="3.3.4" conf="*->default">
<exclude org="ch.qos.reload4j" name="*"/>
<exclude org="org.slf4j" name="*" />
</dependency><!-- End of Hadoop Dependencies -->

<dependency org="org.apache.tika" name="tika-core" rev="2.3.0" />

Expand Down Expand Up @@ -106,7 +117,10 @@
</dependency>

<!-- Jetty used to serve test pages for unit tests, but is also provided as dependency of Hadoop -->
<dependency org="org.eclipse.jetty" name="jetty-server" rev="9.4.50.v20221201" conf="test->default" />
<dependency org="org.eclipse.jetty" name="jetty-server" rev="9.4.50.v20221201" conf="test->default">
<exclude org="ch.qos.reload4j" module="*" />
<exclude org="org.slf4j" module="slf4j-reload" />
</dependency>

<!--Added Because of Elasticsearch JEST client-->
<!--TODO refactor these to indexer-elastic-rest plugin somehow, currently doesn't resolve correctly-->
Expand Down
4 changes: 3 additions & 1 deletion src/plugin/build-plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -265,5 +265,7 @@
<delete includeemptydirs="true" dir="${build.dir}"/>
<delete includeemptydirs="true" dir="${deploy.dir}"/>
</target>

<target name="dependencytree" depends="resolve-default" description="Show dependency tree">
<ivy:dependencytree />
</target>
</project>
4 changes: 3 additions & 1 deletion src/plugin/lib-rabbitmq/ivy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
</publications>

<dependencies>
<dependency org="com.rabbitmq" name="amqp-client" rev="5.2.0"/>
<dependency org="com.rabbitmq" name="amqp-client" rev="5.2.0">
<exclude org="org.slf4j" name="*" />
</dependency>
<dependency org="com.google.code.gson" name="gson" rev="2.8.4"/>
</dependencies>

Expand Down

0 comments on commit d81be51

Please sign in to comment.