diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-12-10 15:15:10 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-12-10 15:15:10 -0800 |
| commit | 1ae89782983a7c9d243f2419bea9e5212b9804cf (patch) | |
| tree | 28043705c5b434a97da2946f6b6d612287157f58 | |
| parent | 01c1f97e95cb8a3575ddeff206d831aed42a2437 (diff) | |
| parent | c1d15ae3d5b331206437c8f5e42f5897af4644a7 (diff) | |
| download | spark-1ae89782983a7c9d243f2419bea9e5212b9804cf.tar.gz spark-1ae89782983a7c9d243f2419bea9e5212b9804cf.tar.bz2 spark-1ae89782983a7c9d243f2419bea9e5212b9804cf.zip | |
Merge pull request #320 from tomdz/master
Shaded repl jar for hadoop1 profile needs to include hadoop classes
| -rw-r--r-- | pom.xml | 1 | ||||
| -rw-r--r-- | repl/pom.xml | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -488,7 +488,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> <version>0.20.205.0</version> - <scope>provided</scope> </dependency> </dependencies> </dependencyManagement> diff --git a/repl/pom.xml b/repl/pom.xml index debd4418a7..f6df4ba9f7 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -129,6 +129,9 @@ <configuration> <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.ManifestResourceTransformer"> <mainClass>spark.repl.Main</mainClass> </transformer> |