From 9a14893330559dc048c2483dac5aa3effff4cd4c Mon Sep 17 00:00:00 2001
From: Sanil15 <sanil.jain15@gmail.com>
Date: Wed, 3 Apr 2019 18:00:12 -0700
Subject: [PATCH 1/4] SAMZA-2155: Remove log4j log4j2 dependency from
 samza-test

---
 build.gradle                                  |  2 -
 .../main/resources/hello-stateful-world.samza |  2 +-
 samza-test/src/main/resources/log4j.xml       | 50 -------------------
 samza-test/src/main/resources/log4j2.xml      | 41 ---------------
 4 files changed, 1 insertion(+), 94 deletions(-)
 delete mode 100644 samza-test/src/main/resources/log4j.xml
 delete mode 100644 samza-test/src/main/resources/log4j2.xml

diff --git a/build.gradle b/build.gradle
index f5d9f51ea7..9a0b9fcd6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -819,8 +819,6 @@ project(":samza-test_$scalaSuffix") {
     compile project(":samza-core_$scalaSuffix")
     compile project(":samza-kafka_$scalaSuffix")
     compile project(":samza-sql_$scalaSuffix")
-    runtime project(":samza-log4j_$scalaSuffix")
-    runtime project(":samza-log4j2_$scalaSuffix")
     runtime project(":samza-yarn_$scalaSuffix")
     runtime project(":samza-hdfs_$scalaSuffix")
     compile "org.scala-lang:scala-library:$scalaVersion"
diff --git a/samza-test/src/main/resources/hello-stateful-world.samza b/samza-test/src/main/resources/hello-stateful-world.samza
index 745f881edd..ffde8bec70 100644
--- a/samza-test/src/main/resources/hello-stateful-world.samza
+++ b/samza-test/src/main/resources/hello-stateful-world.samza
@@ -18,7 +18,7 @@
 
 # Job
 job.factory.class=samza.job.local.ThreadJobFactory
-job.name=hello-stateful-world
+app.name=hello-stateful-world
 
 # Task
 task.class=samza.test.integration.SimpleStatefulTask
diff --git a/samza-test/src/main/resources/log4j.xml b/samza-test/src/main/resources/log4j.xml
deleted file mode 100644
index ab74ebd30b..0000000000
--- a/samza-test/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-  license agreements. See the NOTICE file distributed with this work for additional 
-  information regarding copyright ownership. The ASF licenses this file to 
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
-  this file except in compliance with the License. You may obtain a copy of 
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-  by applicable law or agreed to in writing, software distributed under the 
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-  OF ANY KIND, either express or implied. See the License for the specific 
-  language governing permissions and limitations under the License. -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <param name="Target" value="System.out" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="[%t] %c{1} [%p] %m%n" />
-    </layout>
-  </appender>
-
-  <root>
-    <priority value="info" />
-    <appender-ref ref="console" />
-  </root>
-
-  <logger name="STARTUP_LOGGER" additivity="false">
-    <level value="info" />
-    <appender-ref ref="console"/>
-  </logger>
-
-  <logger name="org.apache.hadoop">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="org.I0Itec.zkclient">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="org.apache.zookeeper">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="org.apache.samza.system.kafka">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="org.apache.kafka">
-    <level value="ERROR"/>
-  </logger>
-  <logger name="kafka">
-    <level value="ERROR"/>
-  </logger>
-</log4j:configuration>
\ No newline at end of file
diff --git a/samza-test/src/main/resources/log4j2.xml b/samza-test/src/main/resources/log4j2.xml
deleted file mode 100644
index f00cb7db71..0000000000
--- a/samza-test/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to
-  you under the Apache License, Version 2.0 (the "License"); you may not use
-  this file except in compliance with the License. You may obtain a copy of
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
-  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-  OF ANY KIND, either express or implied. See the License for the specific
-  language governing permissions and limitations under the License. -->
-
-<Configuration>
-  <Appenders>
-    <Console name="STDOUT" target="SYSTEM_OUT">
-      <PatternLayout pattern="[%t] %c{1} [%p] %m%n"/>
-    </Console>
-  </Appenders>
-  <Loggers>
-    <Root level="info">
-      <AppenderRef ref="STDOUT"/>
-    </Root>
-
-    <Logger name="STARTUP_LOGGER" level="info" additivity="false">
-      <AppenderRef ref="STDOUT"/>
-    </Logger>
-
-    <Logger name="org.apache.hadoop" level="error"></Logger>
-
-    <Logger name="org.I0Itec.zkclient" level="error"></Logger>
-
-    <Logger name="org.apache.zookeeper" level="error"></Logger>
-
-    <Logger name="org.apache.samza.system.kafka" level="error"></Logger>
-
-    <Logger name="org.apache.kafka" level="error"></Logger>
-
-    <Logger name="kafka" level="error"></Logger>
-
-  </Loggers>
-</Configuration>
\ No newline at end of file

From a890e4c04271b66ab355714cc5a8f1593b357a49 Mon Sep 17 00:00:00 2001
From: Sanil15 <sanil.jain15@gmail.com>
Date: Fri, 5 Apr 2019 10:56:23 -0700
Subject: [PATCH 2/4] Addressing Review, adding slf4j safeguards

---
 build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.gradle b/build.gradle
index 9a0b9fcd6e..c7ef05a403 100644
--- a/build.gradle
+++ b/build.gradle
@@ -810,6 +810,9 @@ project(":samza-test_$scalaSuffix") {
     compile.exclude group: 'javax.jms', module: 'jms'
     compile.exclude group: 'com.sun.jdmk', module: 'jmxtools'
     compile.exclude group: 'com.sun.jmx', module: 'jmxri'
+    // Exclude Sl4j bindings for log4j1 and log4j2 since samza-test just logs to console using slf4j-simple
+    compile.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+    compile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
   }
 
   dependencies {

From 7e7d357065c94b128d3d70e12fcf3dfa1612ead4 Mon Sep 17 00:00:00 2001
From: Sanil15 <sanil.jain15@gmail.com>
Date: Fri, 5 Apr 2019 10:59:21 -0700
Subject: [PATCH 3/4] Removing a typo

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c7ef05a403..cde6ead381 100644
--- a/build.gradle
+++ b/build.gradle
@@ -810,7 +810,7 @@ project(":samza-test_$scalaSuffix") {
     compile.exclude group: 'javax.jms', module: 'jms'
     compile.exclude group: 'com.sun.jdmk', module: 'jmxtools'
     compile.exclude group: 'com.sun.jmx', module: 'jmxri'
-    // Exclude Sl4j bindings for log4j1 and log4j2 since samza-test just logs to console using slf4j-simple
+    // Exclude Slf4j bindings for log4j1 and log4j2 since samza-test just logs to console using slf4j-simple
     compile.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     compile.exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
   }

From b60f35d56a9c3bb0d67d0fea91aeaec2cbd9c3d0 Mon Sep 17 00:00:00 2001
From: Sanil15 <sanil.jain15@gmail.com>
Date: Mon, 8 Apr 2019 17:39:41 -0700
Subject: [PATCH 4/4] Reverting a minor fix

---
 samza-test/src/main/resources/hello-stateful-world.samza | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samza-test/src/main/resources/hello-stateful-world.samza b/samza-test/src/main/resources/hello-stateful-world.samza
index ffde8bec70..745f881edd 100644
--- a/samza-test/src/main/resources/hello-stateful-world.samza
+++ b/samza-test/src/main/resources/hello-stateful-world.samza
@@ -18,7 +18,7 @@
 
 # Job
 job.factory.class=samza.job.local.ThreadJobFactory
-app.name=hello-stateful-world
+job.name=hello-stateful-world
 
 # Task
 task.class=samza.test.integration.SimpleStatefulTask