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 /assembly | |
| 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 'assembly')
| -rw-r--r-- | assembly/pom.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index 9b70812c64..54a25910ce 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -108,12 +108,12 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <resource>META-INF/services/org.apache.hadoop.fs.FileSystem</resource> </transformer> - </transformers> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <resource>reference.conf</resource> </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>log4j.properties</resource> + </transformer> </transformers> </configuration> </execution> |