diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-07 12:42:19 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-07 12:56:24 -0800 |
| commit | e688e11206401850a13a87d7db52941cc716f88a (patch) | |
| tree | 890582f5f577909e2fdd0463fb9726e51a014af6 /core/src/main/resources | |
| parent | 15d953450167c4ec45c9d0a2c7ab8ee71be2e576 (diff) | |
| download | spark-e688e11206401850a13a87d7db52941cc716f88a.tar.gz spark-e688e11206401850a13a87d7db52941cc716f88a.tar.bz2 spark-e688e11206401850a13a87d7db52941cc716f88a.zip | |
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.
Diffstat (limited to 'core/src/main/resources')
| -rw-r--r-- | core/src/main/resources/org/apache/spark/log4j-defaults.properties (renamed from core/src/main/resources/org/apache/spark/default-log4j.properties) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/core/src/main/resources/org/apache/spark/default-log4j.properties b/core/src/main/resources/org/apache/spark/log4j-defaults.properties index d72dbadc39..d72dbadc39 100644 --- a/core/src/main/resources/org/apache/spark/default-log4j.properties +++ b/core/src/main/resources/org/apache/spark/log4j-defaults.properties |