From ff8471341fb3410af1e3caf56b2d94f4542e9432 Mon Sep 17 00:00:00 2001
From: Joel Dudley <joel.dudley@r3cev.com>
Date: Mon, 4 Jun 2018 23:24:36 +0100
Subject: [PATCH] Removes Log4J from Core. Readds to shell where required.
 (#3257)

* Removes Log4J dependency from `core`.

* Adds dependency on Log4J directly to shell. Missing colons.
---
 core/build.gradle        |  3 ---
 tools/shell/build.gradle | 13 ++++++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index ad8eff3b40..468a8dac45 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -80,9 +80,6 @@ dependencies {
     // Thread safety annotations
     compile "com.google.code.findbugs:jsr305:$jsr305_version"
 
-    // Log4J: logging framework (ONLY explicitly referenced by net.corda.core.utilities.Logging.kt)
-    compile "org.apache.logging.log4j:log4j-core:${log4j_version}"
-
     // SLF4J: commons-logging bindings for a SLF4J back end
     compile "org.slf4j:jcl-over-slf4j:$slf4j_version"
     compile "org.slf4j:slf4j-api:$slf4j_version"
diff --git a/tools/shell/build.gradle b/tools/shell/build.gradle
index 9d3085189f..a2d0303273 100644
--- a/tools/shell/build.gradle
+++ b/tools/shell/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     compile project(':node-api')
     compile project(':client:rpc')
 
-    // Jackson support: serialisation to/from JSON, YAML, etc
+    // Jackson support: serialisation to/from JSON, YAML, etc.
     compile project(':client:jackson')
 
 
@@ -58,8 +58,11 @@ dependencies {
     // JAnsi: for drawing things to the terminal in nicely coloured ways.
     compile "org.fusesource.jansi:jansi:$jansi_version"
 
-    // Manifests: for reading stuff from the manifest file
+    // Manifests: for reading stuff from the manifest file.
     compile "com.jcabi:jcabi-manifests:1.1"
+    
+    // For logging.
+    compile "org.apache.logging.log4j:log4j-core:${log4j_version}"
 
     // Unit testing helpers.
     testCompile "junit:junit:$junit_version"
@@ -67,11 +70,11 @@ dependencies {
     testCompile project(':test-utils')
     testCompile project(':finance')
 
-    // Integration test helpers
+    // Integration test helpers.
     integrationTestCompile "junit:junit:$junit_version"
     integrationTestCompile "org.assertj:assertj-core:${assertj_version}"
 
-    // Jsh: Testing SSH server
+    // Jsh: Testing SSH server.
     integrationTestCompile "com.jcraft:jsch:$jsch_version"
 
     integrationTestCompile project(':node-driver')
@@ -94,4 +97,4 @@ task integrationTest(type: Test) {
 
 publish {
     name jar.baseName
-}
\ No newline at end of file
+}