[2/2] git commit: Merge pull request #351 from pwendell/maven-fix

[pw...@apache.org]

Merge pull request #351 from pwendell/maven-fix

Add log4j exclusion rule to maven.

To make this work I had to rename the defaults file. Otherwise
maven's pattern matching rules included it when trying to match
other log4j.properties files.

I also fixed a bug in the existing maven build where two
<transformers> tags were present in assembly/pom.xml
such that one overwrote the other.


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/6ccf8ce7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/6ccf8ce7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/6ccf8ce7

Branch: refs/heads/master
Commit: 6ccf8ce705f13b5c6993675ee034db64363caa31
Parents: 7d5fa17 e688e11
Author: Patrick Wendell <pw...@gmail.com>
Authored: Tue Jan 7 15:49:14 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Tue Jan 7 15:49:14 2014 -0800

----------------------------------------------------------------------
 assembly/pom.xml                                          |  6 +++---
 .../resources/org/apache/spark/default-log4j.properties   |  8 --------
 .../resources/org/apache/spark/log4j-defaults.properties  |  8 ++++++++
 core/src/main/scala/org/apache/spark/Logging.scala        | 10 ++++++----
 examples/pom.xml                                          |  3 +++
 5 files changed, 20 insertions(+), 15 deletions(-)
----------------------------------------------------------------------