diff --git a/flink/flink-scala-2.12/pom.xml b/flink/flink-scala-2.12/pom.xml index 54abed7ac74..81e8b1dec2e 100644 --- a/flink/flink-scala-2.12/pom.xml +++ b/flink/flink-scala-2.12/pom.xml @@ -295,6 +295,12 @@ hadoop-common ${flink.hadoop.version} provided + + + log4j + log4j + + diff --git a/pom.xml b/pom.xml index f5ad751a46c..4e4219138cf 100644 --- a/pom.xml +++ b/pom.xml @@ -114,8 +114,8 @@ 1.12.1 - 1.7.30 - 1.2.17 + 1.7.35 + 1.2.25 0.13.0 0.62.2 2.8.9 @@ -229,8 +229,20 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j ${slf4j.version} + + + ch.qos.reload4j + reload4j + + + + + + ch.qos.reload4j + reload4j + ${reload4j.version} @@ -240,12 +252,6 @@ ${slf4j.version} - - log4j - log4j - ${log4j.version} - - org.apache.thrift libthrift @@ -649,6 +655,10 @@ commons-logging commons-logging + + log4j + log4j + @@ -1117,6 +1127,14 @@ commons-logging commons-logging + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + org.ow2.asm asm @@ -1332,6 +1350,10 @@ commons-logging commons-logging + + log4j + log4j + com.fasterxml.jackson.core jackson-databind diff --git a/rlang/pom.xml b/rlang/pom.xml index a291c63b51d..6e4a0d0ad2e 100644 --- a/rlang/pom.xml +++ b/rlang/pom.xml @@ -90,6 +90,11 @@ httpclient + + ch.qos.reload4j + reload4j + + org.mockito mockito-core @@ -126,6 +131,12 @@ hadoop-common ${hadoop.version} compile + + + log4j + log4j + + @@ -206,6 +217,7 @@ org.apache.zeppelin:zeppelin-interpreter-shaded + log4j:log4j ${project.build.directory}/../../interpreter/r/${interpreter.jar.name}-${project.version}.jar diff --git a/shell/pom.xml b/shell/pom.xml index 450608a935d..182ef23943e 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -83,6 +83,10 @@ com.google.guava guava + + log4j + log4j + diff --git a/submarine/pom.xml b/submarine/pom.xml index 55e6638af38..90e3c2db4b8 100644 --- a/submarine/pom.xml +++ b/submarine/pom.xml @@ -106,6 +106,14 @@ org.codehaus.jackson jackson-core-asl + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index 22dc853f06f..3fed5e7b541 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -226,6 +226,7 @@ The following components are provided under Apache License. (Apache 2.0) Dropwizard Jackson Integration for Metrics (io.dropwizard.metrics:metrics-json:4.1.14) - https://github.com/dropwizard/metrics/blob/release/4.1.x/LICENSE (Apache 2.0) Dropwizard Metrics Health Checks (io.dropwizard.metrics:metrics-healthchecks:4.1.14) - https://github.com/dropwizard/metrics/blob/release/4.1.x/LICENSE (Apache 2.0) Dropwizard Metrics Integration with JMX (io.dropwizard.metrics:metrics-jmx:4.1.14) - https://github.com/dropwizard/metrics/blob/release/4.1.x/LICENSE + (Apache 2.0) reload4j v1.2.25 (ch.qos.reload4j:reload4j:jar:1.2.25 - https://reload4j.qos.ch/) - https://github.com/qos-ch/reload4j/blob/master/LICENSE ======================================================================== MIT licenses @@ -257,9 +258,9 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) moment-duration-format v1.3.0 (https://github.com/jsmreese/moment-duration-format) - https://github.com/jsmreese/moment-duration-format/blob/1.3.0/LICENSE (The MIT License) angular-ui-grid v4.0.4 (https://github.com/angular-ui/ui-grid) - https://github.com/angular-ui/ui-grid/blob/v4.0.4/LICENSE.md (The MIT License) Pikaday v1.3.2 (https://github.com/dbushell/Pikaday) - https://github.com/dbushell/Pikaday/blob/1.3.2/LICENSE - (The MIT License) slf4j v1.7.10 (org.slf4j:slf4j-api:jar:1.7.10 - http://www.slf4j.org) - http://www.slf4j.org/license.html + (The MIT License) slf4j v1.7.35 (org.slf4j:slf4j-api:jar:1.7.35 - http://www.slf4j.org) - http://www.slf4j.org/license.html (The MIT License) slf4j v1.7.21 (org.slf4j:slf4j-simple:1.7.21 - http://www.slf4j.org) - http://www.slf4j.org/license.html - (The MIT License) slf4j-log4j12 v1.7.10 (org.slf4j:slf4j-log4j12:jar:1.7.10 - http://www.slf4j.org) - http://www.slf4j.org/license.html + (The MIT License) slf4j-reload4j v1.7.35 (org.slf4j:slf4j-reload4j:jar:1.7.35 - http://www.slf4j.org) - http://www.slf4j.org/license.html (The MIT License) bcprov-jdk15on v1.70 (org.bouncycastle:bcprov-jdk15on:jar:1.70 - http://www.bouncycastle.org/java.html) - http://www.bouncycastle.org/licence.html (The MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs) - https://github.com/bryanbraun/anchorjs/blob/master/README.md#license (The MIT License) moment-duration-format v1.3.0 (https://github.com/jsmreese/moment-duration-format) - https://github.com/jsmreese/moment-duration-format/blob/master/LICENSE diff --git a/zeppelin-examples/zeppelin-example-clock/pom.xml b/zeppelin-examples/zeppelin-example-clock/pom.xml index b5cce04897b..b30656b34d7 100644 --- a/zeppelin-examples/zeppelin-example-clock/pom.xml +++ b/zeppelin-examples/zeppelin-example-clock/pom.xml @@ -52,7 +52,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j + + + + ch.qos.reload4j + reload4j diff --git a/zeppelin-examples/zeppelin-example-horizontalbar/pom.xml b/zeppelin-examples/zeppelin-example-horizontalbar/pom.xml index ed11e3baa3d..c03746a0f27 100644 --- a/zeppelin-examples/zeppelin-example-horizontalbar/pom.xml +++ b/zeppelin-examples/zeppelin-example-horizontalbar/pom.xml @@ -52,7 +52,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j + + + + ch.qos.reload4j + reload4j diff --git a/zeppelin-examples/zeppelin-example-spell-echo/pom.xml b/zeppelin-examples/zeppelin-example-spell-echo/pom.xml index 3d7f9c23cd9..90bca363e1b 100644 --- a/zeppelin-examples/zeppelin-example-spell-echo/pom.xml +++ b/zeppelin-examples/zeppelin-example-spell-echo/pom.xml @@ -52,7 +52,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j + + + + ch.qos.reload4j + reload4j diff --git a/zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml b/zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml index 7174b8af060..1a2ba4cedf4 100644 --- a/zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml +++ b/zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml @@ -52,7 +52,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j + + + + ch.qos.reload4j + reload4j diff --git a/zeppelin-examples/zeppelin-example-spell-markdown/pom.xml b/zeppelin-examples/zeppelin-example-spell-markdown/pom.xml index 85e0ba3d9f9..dcb9147fcf9 100644 --- a/zeppelin-examples/zeppelin-example-spell-markdown/pom.xml +++ b/zeppelin-examples/zeppelin-example-spell-markdown/pom.xml @@ -52,7 +52,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j + + + + ch.qos.reload4j + reload4j diff --git a/zeppelin-examples/zeppelin-example-spell-translator/pom.xml b/zeppelin-examples/zeppelin-example-spell-translator/pom.xml index 4508f78c055..2dcb5a303ba 100644 --- a/zeppelin-examples/zeppelin-example-spell-translator/pom.xml +++ b/zeppelin-examples/zeppelin-example-spell-translator/pom.xml @@ -52,7 +52,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j + + + + ch.qos.reload4j + reload4j diff --git a/zeppelin-interpreter-parent/pom.xml b/zeppelin-interpreter-parent/pom.xml index 0328f40e04b..22c2dce8bfa 100644 --- a/zeppelin-interpreter-parent/pom.xml +++ b/zeppelin-interpreter-parent/pom.xml @@ -62,7 +62,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j + + + + ch.qos.reload4j + reload4j diff --git a/zeppelin-interpreter-shaded/pom.xml b/zeppelin-interpreter-shaded/pom.xml index 3f79e3ebb5b..af270ede44c 100644 --- a/zeppelin-interpreter-shaded/pom.xml +++ b/zeppelin-interpreter-shaded/pom.xml @@ -54,11 +54,10 @@ - org.slf4j:slf4j-api - org.slf4j:slf4j-log4j12 - org.slf4j:jcl-over-slf4j + org.slf4j:* log4j:log4j + ch.qos.reload4j:reload4j diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml index f9104498c42..160dcbb727c 100644 --- a/zeppelin-interpreter/pom.xml +++ b/zeppelin-interpreter/pom.xml @@ -138,7 +138,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j + + + + ch.qos.reload4j + reload4j @@ -264,11 +269,27 @@ org.apache.hadoop hadoop-common + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + org.apache.hadoop hadoop-yarn-client + + + log4j + log4j + + diff --git a/zeppelin-jupyter-interpreter-shaded/pom.xml b/zeppelin-jupyter-interpreter-shaded/pom.xml index a5e6d5fc80a..bef71493493 100644 --- a/zeppelin-jupyter-interpreter-shaded/pom.xml +++ b/zeppelin-jupyter-interpreter-shaded/pom.xml @@ -66,6 +66,11 @@ ${google.errorprone.version} + + ch.qos.reload4j + reload4j + + @@ -100,6 +105,7 @@ org.apache.zeppelin:zeppelin-interpreter-shaded + log4j:log4j diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 337989dc6e0..ec34f726131 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -88,6 +88,10 @@ org.slf4j slf4j-log4j12 + + org.slf4j + slf4j-reload4j + org.slf4j jcl-over-slf4j @@ -102,7 +106,11 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j + + + ch.qos.reload4j + reload4j org.slf4j diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml index 9cd879c815b..58eb2114ce2 100644 --- a/zeppelin-zengine/pom.xml +++ b/zeppelin-zengine/pom.xml @@ -321,6 +321,12 @@ org.apache.hadoop hadoop-common + + + log4j + log4j + +