spark git commit: [SPARK-5993][Streaming][Build] Fix assembly jar location of kafka-assembly

[td...@apache.org]

Repository: spark
Updated Branches:
  refs/heads/master fba11c2f5 -> 922b43b3c


[SPARK-5993][Streaming][Build] Fix assembly jar location of kafka-assembly

Published Kafka-assembly JAR was empty in 1.3.0-RC1
This is because the maven build generated two Jars-
1. an empty JAR file (since kafka-assembly has no code of its own)
2. a assembly JAR file containing everything in a different location as 1
The maven publishing plugin uploaded 1 and not 2.
Instead if 2 is not configure to generate in a different location, there is only 1 jar containing everything, which gets published.

Author: Tathagata Das <ta...@gmail.com>

Closes #4753 from tdas/SPARK-5993 and squashes the following commits:

c390db8 [Tathagata Das] Fix assembly jar location of kafka-assembly


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

Branch: refs/heads/master
Commit: 922b43b3cc1cca04e0313bf9e31c5f944ac06d1f
Parents: fba11c2
Author: Tathagata Das <ta...@gmail.com>
Authored: Tue Feb 24 19:10:37 2015 -0800
Committer: Tathagata Das <ta...@gmail.com>
Committed: Tue Feb 24 19:10:37 2015 -0800

----------------------------------------------------------------------
 external/kafka-assembly/pom.xml | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/922b43b3/external/kafka-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/external/kafka-assembly/pom.xml b/external/kafka-assembly/pom.xml
index 503fc12..8daa7ed 100644
--- a/external/kafka-assembly/pom.xml
+++ b/external/kafka-assembly/pom.xml
@@ -33,9 +33,6 @@
 
   <properties>
     <sbt.project.name>streaming-kafka-assembly</sbt.project.name>
-    <spark.jar.dir>scala-${scala.binary.version}</spark.jar.dir>
-    <spark.jar.basename>spark-streaming-kafka-assembly-${project.version}.jar</spark.jar.basename>
-    <spark.jar>${project.build.directory}/${spark.jar.dir}/${spark.jar.basename}</spark.jar>
   </properties>
 
   <dependencies>
@@ -61,7 +58,6 @@
       <artifactId>maven-shade-plugin</artifactId>
       <configuration>
         <shadedArtifactAttached>false</shadedArtifactAttached>
-        <outputFile>${spark.jar}</outputFile>
         <artifactSet>
           <includes>
             <include>*:*</include>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org