Skip to content

Commit 96cea1f

Browse files
committed
SPARK-1776 Have Spark's SBT build read dependencies from Maven.
1 parent 36efa62 commit 96cea1f

File tree

29 files changed

+329
-38
lines changed

29 files changed

+329
-38
lines changed

assembly/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<packaging>pom</packaging>
3333

3434
<properties>
35+
<sbt.project.name>assembly</sbt.project.name>
3536
<spark.jar.dir>scala-${scala.binary.version}</spark.jar.dir>
3637
<spark.jar.basename>spark-assembly-${project.version}-hadoop${hadoop.version}.jar</spark.jar.basename>
3738
<spark.jar>${project.build.directory}/${spark.jar.dir}/${spark.jar.basename}</spark.jar>

bagel/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<groupId>org.apache.spark</groupId>
2929
<artifactId>spark-bagel_2.10</artifactId>
3030
<properties>
31-
<sbt.project.name>spark-bagel</sbt.project.name>
31+
<sbt.project.name>bagel</sbt.project.name>
3232
</properties>
3333
<packaging>jar</packaging>
3434
<name>Spark Project Bagel</name>

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<groupId>org.apache.spark</groupId>
2929
<artifactId>spark-core_2.10</artifactId>
3030
<properties>
31-
<sbt.project.name>spark-core</sbt.project.name>
31+
<sbt.project.name>core</sbt.project.name>
3232
</properties>
3333
<packaging>jar</packaging>
3434
<name>Spark Project Core</name>

examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<groupId>org.apache.spark</groupId>
2929
<artifactId>spark-examples_2.10</artifactId>
3030
<properties>
31-
<sbt.project.name>spark-examples</sbt.project.name>
31+
<sbt.project.name>examples</sbt.project.name>
3232
</properties>
3333
<packaging>jar</packaging>
3434
<name>Spark Project Examples</name>

external/flume/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<groupId>org.apache.spark</groupId>
2929
<artifactId>spark-streaming-flume_2.10</artifactId>
3030
<properties>
31-
<sbt.project.name>spark-streaming-flume</sbt.project.name>
31+
<sbt.project.name>streaming-flume</sbt.project.name>
3232
</properties>
3333
<packaging>jar</packaging>
3434
<name>Spark Project External Flume</name>

external/kafka/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<groupId>org.apache.spark</groupId>
2929
<artifactId>spark-streaming-kafka_2.10</artifactId>
3030
<properties>
31-
<sbt.project.name>spark-streaming-kafka</sbt.project.name>
31+
<sbt.project.name>streaming-kafka</sbt.project.name>
3232
</properties>
3333
<packaging>jar</packaging>
3434
<name>Spark Project External Kafka</name>

external/mqtt/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<groupId>org.apache.spark</groupId>
2929
<artifactId>spark-streaming-mqtt_2.10</artifactId>
3030
<properties>
31-
<sbt.project.name>spark-streaming-mqtt</sbt.project.name>
31+
<sbt.project.name>streaming-mqtt</sbt.project.name>
3232
</properties>
3333
<packaging>jar</packaging>
3434
<name>Spark Project External MQTT</name>

external/twitter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<groupId>org.apache.spark</groupId>
2929
<artifactId>spark-streaming-twitter_2.10</artifactId>
3030
<properties>
31-
<sbt.project.name>spark-streaming-twitter</sbt.project.name>
31+
<sbt.project.name>streaming-twitter</sbt.project.name>
3232
</properties>
3333
<packaging>jar</packaging>
3434
<name>Spark Project External Twitter</name>

external/zeromq/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<groupId>org.apache.spark</groupId>
2929
<artifactId>spark-streaming-zeromq_2.10</artifactId>
3030
<properties>
31-
<sbt.project.name>spark-streaming-zeromq</sbt.project.name>
31+
<sbt.project.name>streaming-zeromq</sbt.project.name>
3232
</properties>
3333
<packaging>jar</packaging>
3434
<name>Spark Project External ZeroMQ</name>

extras/java8-tests/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
<artifactId>java8-tests_2.10</artifactId>
2929
<packaging>pom</packaging>
3030
<name>Spark Project Java8 Tests POM</name>
31-
31+
32+
<properties>
33+
<sbt.project.name>java8-tests</sbt.project.name>
34+
</properties>
35+
3236
<dependencies>
3337
<dependency>
3438
<groupId>org.apache.spark</groupId>

0 commit comments

Comments
 (0)