From f9a5133d8b8d0f624c299af7b0609db6f11d3a4a Mon Sep 17 00:00:00 2001
From: Robert Metzger <rmetzger@apache.org>
Date: Thu, 4 Jun 2015 17:50:24 +0200
Subject: [PATCH] [FLINK-2123] Fix log4j warnings on CliFrontend startup

---
 flink-dist/pom.xml                      | 10 ++++++++++
 flink-dist/src/main/flink-bin/bin/flink |  4 ++--
 pom.xml                                 |  3 ++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index e4ee165eab407..0e45202182a9b 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -309,6 +309,16 @@ under the License.
 							<createDependencyReducedPom>false</createDependencyReducedPom>
 							<shadedArtifactAttached>false</shadedArtifactAttached>
 							<finalName>${project.artifactId}-${project.version}</finalName>
+							<filters>
+								<!-- Globally exclude log4j.properties from our JAR files. -->
+								<filter>
+									<artifact>*</artifact>
+									<excludes>
+										<exclude>log4j.properties</exclude>
+										<exclude>log4j-test.properties</exclude>
+									</excludes>
+								</filter>
+							</filters>
 							<artifactSet>
 								<excludes>
 									<exclude>org.apache.flink:flink-java-examples</exclude>
diff --git a/flink-dist/src/main/flink-bin/bin/flink b/flink-dist/src/main/flink-bin/bin/flink
index 842dd9817ed82..eb8bca0f822e6 100644
--- a/flink-dist/src/main/flink-bin/bin/flink
+++ b/flink-dist/src/main/flink-bin/bin/flink
@@ -30,10 +30,10 @@ fi
 CC_CLASSPATH=`constructFlinkClassPath`
 
 log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-flink-client-$HOSTNAME.log
-log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-cli.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml"
+log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-cli.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml)
 
 export FLINK_ROOT_DIR
 export FLINK_CONF_DIR
 
 # Add HADOOP_CLASSPATH to allow the usage of Hadoop file systems
-$JAVA_RUN $JVM_ARGS "$log_setting" -classpath "`manglePathList "$CC_CLASSPATH:$INTERNAL_HADOOP_CLASSPATHS"`" org.apache.flink.client.CliFrontend "$@"
+$JAVA_RUN $JVM_ARGS "${log_setting[@]}" -classpath "`manglePathList "$CC_CLASSPATH:$INTERNAL_HADOOP_CLASSPATHS"`" org.apache.flink.client.CliFrontend "$@"
diff --git a/pom.xml b/pom.xml
index 05d63f5323187..98a76a5803aa7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -878,8 +878,9 @@ under the License.
 							<createDependencyReducedPom>true</createDependencyReducedPom>
 							<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
 							<filters>
+								<!-- Globally exclude log4j.properties from our JAR files. -->
 								<filter>
-									<artifact>org.apache.flink:*</artifact>
+									<artifact>*</artifact>
 									<excludes>
 										<exclude>log4j.properties</exclude>
 										<exclude>log4j-test.properties</exclude>