[geode] 08/10: GEODE-7058: Mark log4j-core optional in geode-core

[on...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

onichols pushed a commit to branch release/1.9.1
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 63034887c70e7bb7ec5e086b5154b626049a84c0
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Wed Aug 7 14:33:21 2019 -0700

    GEODE-7058: Mark log4j-core optional in geode-core
    
    Note: this change requires all commits from GEODE-2644 and GEODE-6122.
    (cherry picked from commit 413800bc16d05df689a2af5c30797f180aad6088)
---
 geode-core/build.gradle                        | 4 +++-
 geode-core/src/test/resources/expected-pom.xml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index caf08a5..12b6b92 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -215,7 +215,9 @@ dependencies {
   compile('net.sf.jopt-simple:jopt-simple')
 
   compile('org.apache.logging.log4j:log4j-api')
-  compile('org.apache.logging.log4j:log4j-core')
+  compile('org.apache.logging.log4j:log4j-core') {
+    ext.optional = true
+  }
 
   runtimeOnly('org.fusesource.jansi:jansi') {
     ext.optional = true
diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
index 604bbe5..c0dfba5 100644
--- a/geode-core/src/test/resources/expected-pom.xml
+++ b/geode-core/src/test/resources/expected-pom.xml
@@ -199,6 +199,7 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
       <scope>compile</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>