diff --git a/assembly/pom.xml b/assembly/pom.xml index 4146168fc804b..ee62a9c09413d 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-assembly_2.10 + spark-assembly Spark Project Assembly http://spark.apache.org/ pom diff --git a/bagel/pom.xml b/bagel/pom.xml index 93db0d5efda5f..593eb2785fe15 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-bagel_2.10 + spark-bagel bagel diff --git a/core/pom.xml b/core/pom.xml index b2b788a4bc13b..a79afdf1356d2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-core_2.10 + spark-core core diff --git a/examples/pom.xml b/examples/pom.xml index 3f46c40464d3b..c8d76593562b0 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-examples_2.10 + spark-examples examples diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index ac291bd4fde20..00ffc3e601711 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-streaming-flume-sink_2.10 + spark-streaming-flume-sink streaming-flume-sink diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 7d31e32283d88..1e2fbddc254bf 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-streaming-flume_2.10 + spark-streaming-flume streaming-flume diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index 2067c473f0e3f..8c21c4429cd8a 100644 --- a/external/kafka/pom.xml +++ b/external/kafka/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-streaming-kafka_2.10 + spark-streaming-kafka streaming-kafka diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index 371f1f1e9d39a..ef3b78718a384 100644 --- a/external/mqtt/pom.xml +++ b/external/mqtt/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-streaming-mqtt_2.10 + spark-streaming-mqtt streaming-mqtt diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index 1d7dd49d15c22..d619f409dd650 100644 --- a/external/twitter/pom.xml +++ b/external/twitter/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-streaming-twitter_2.10 + spark-streaming-twitter streaming-twitter diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index 7e48968feb3bc..5b5a3a7a32b2d 100644 --- a/external/zeromq/pom.xml +++ b/external/zeromq/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-streaming-zeromq_2.10 + spark-streaming-zeromq streaming-zeromq diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml index 8658ecf5abfab..b0713a665032f 100644 --- a/extras/java8-tests/pom.xml +++ b/extras/java8-tests/pom.xml @@ -25,7 +25,7 @@ org.apache.spark - java8-tests_2.10 + java8-tests pom Spark Project Java8 Tests POM diff --git a/extras/kinesis-asl/pom.xml b/extras/kinesis-asl/pom.xml index 560244ad93369..743a6a9e5a172 100644 --- a/extras/kinesis-asl/pom.xml +++ b/extras/kinesis-asl/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-streaming-kinesis-asl_2.10 + spark-streaming-kinesis-asl jar Spark Kinesis Integration diff --git a/extras/spark-ganglia-lgpl/pom.xml b/extras/spark-ganglia-lgpl/pom.xml index 71a078d58a8d8..ba2b6da73fe46 100644 --- a/extras/spark-ganglia-lgpl/pom.xml +++ b/extras/spark-ganglia-lgpl/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-ganglia-lgpl_2.10 + spark-ganglia-lgpl jar Spark Ganglia Integration diff --git a/graphx/pom.xml b/graphx/pom.xml index 3f49b1d63b6e1..66f7d464538fb 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-graphx_2.10 + spark-graphx graphx diff --git a/mllib/pom.xml b/mllib/pom.xml index a5eeef88e9d62..f204bf45e5fdc 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-mllib_2.10 + spark-mllib mllib diff --git a/pom.xml b/pom.xml index 64fb1e57e30e0..35a57c9c34f95 100644 --- a/pom.xml +++ b/pom.xml @@ -89,9 +89,9 @@ core bagel graphx + streaming mllib tools - streaming sql/catalyst sql/core sql/hive @@ -99,8 +99,8 @@ assembly external/twitter external/kafka - external/flume external/flume-sink + external/flume external/zeromq external/mqtt examples @@ -774,9 +774,20 @@ + + ${project.artifactId}_${scala.binary.version}-${project.version} + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + true + + + org.apache.maven.plugins maven-enforcer-plugin 1.3.1 @@ -961,6 +972,30 @@ + + org.apache.spark + scala-install-plugin + 0.1-SNAPSHOT + + + install + + install + + install + + ${project.artifactId}_${scala.binary.version} + + + + load + + init-scala + + initialize + + + org.apache.maven.plugins maven-enforcer-plugin diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala index 3ef2d5451da0d..4f30b76f9a221 100644 --- a/project/project/SparkPluginBuild.scala +++ b/project/project/SparkPluginBuild.scala @@ -26,7 +26,7 @@ import sbt.Keys._ object SparkPluginDef extends Build { lazy val root = Project("plugins", file(".")) dependsOn(sparkStyle, sbtPomReader) lazy val sparkStyle = Project("spark-style", file("spark-style"), settings = styleSettings) - lazy val sbtPomReader = uri("https://github.com/ScrapCodes/sbt-pom-reader.git") + lazy val sbtPomReader = uri("https://github.com/ScrapCodes/sbt-pom-reader.git#wip-cross-build") // There is actually no need to publish this artifact. def styleSettings = Defaults.defaultSettings ++ Seq ( diff --git a/repl/pom.xml b/repl/pom.xml index fcc5f90d870e8..de0321ed4800c 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-repl_2.10 + spark-repl jar Spark Project REPL http://spark.apache.org/ diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 0d756f873e486..f8f0fc5a19507 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -27,7 +27,7 @@ org.apache.spark - spark-catalyst_2.10 + spark-catalyst jar Spark Project Catalyst http://spark.apache.org/ diff --git a/sql/core/pom.xml b/sql/core/pom.xml index bd110218d34f7..f64b7856bb64d 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -27,7 +27,7 @@ org.apache.spark - spark-sql_2.10 + spark-sql jar Spark Project SQL http://spark.apache.org/ diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 124fc107cb8aa..8fed12a6596da 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -27,7 +27,7 @@ org.apache.spark - spark-hive-thriftserver_2.10 + spark-hive-thriftserver jar Spark Project Hive Thrift Server http://spark.apache.org/ diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 45a4c6dc98da0..0bffd43d7343a 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -27,7 +27,7 @@ org.apache.spark - spark-hive_2.10 + spark-hive jar Spark Project Hive http://spark.apache.org/ diff --git a/streaming/pom.xml b/streaming/pom.xml index 12f900c91eb98..8ad730b9e4e6a 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -26,7 +26,7 @@ org.apache.spark - spark-streaming_2.10 + spark-streaming streaming @@ -77,7 +77,7 @@ org.scalatest scalatest-maven-plugin - +