diff --git a/assembly/pom.xml b/assembly/pom.xml index 28b0692dff10350dab30a6863dee475e9fb5234f..8103534796c83467f5c0d4fe447af490855cfc72 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-assembly_${scala-short.version}</artifactId> + <artifactId>spark-assembly_2.10</artifactId> <name>Spark Project Assembly</name> <url>http://spark.incubator.apache.org/</url> diff --git a/bagel/pom.xml b/bagel/pom.xml index c8b9c4f4cdd979c32724e642e75ad49515fe0927..461e76a753d911cd62435d35db102ed854604055 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-bagel_${scala-short.version}</artifactId> + <artifactId>spark-bagel_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Bagel</name> <url>http://spark.incubator.apache.org/</url> diff --git a/core/pom.xml b/core/pom.xml index e2033c9912018c94d22585b514fb57ca2a3ce7f3..af605e18371f6be4bc0da448d63207530fbc0ee9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_${scala-short.version}</artifactId> + <artifactId>spark-core_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Core</name> <url>http://spark.incubator.apache.org/</url> diff --git a/examples/pom.xml b/examples/pom.xml index a10dee7847b2347c719aee8fa5d7ef85fcd1af71..464ad82e338fbb25e8d6b083012c90dbf6e61186 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-examples_${scala-short.version}</artifactId> + <artifactId>spark-examples_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Examples</name> <url>http://spark.incubator.apache.org/</url> diff --git a/mllib/pom.xml b/mllib/pom.xml index a57bddeff3118d4c6c85a4c23088cb1b002da60f..fce5b19bb2fec62d59ee8762e0aaf797b64aa234 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-mllib_${scala-short.version}</artifactId> + <artifactId>spark-mllib_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project ML Library</name> <url>http://spark.incubator.apache.org/</url> diff --git a/pom.xml b/pom.xml index 8700a4828f3faf7b462892de9b60b8638c404eba..4c1145908802d53c319cf10c60ffbb25c972649f 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ <scala-short.version>2.10</scala-short.version> <scala.version>2.10.3</scala.version> <mesos.version>0.13.0</mesos.version> - <akka.version>2.2.1</akka.version> + <akka.version>2.2.3</akka.version> <slf4j.version>1.7.2</slf4j.version> <log4j.version>1.2.17</log4j.version> <hadoop.version>1.0.4</hadoop.version> @@ -116,10 +116,10 @@ </properties> <repositories> - <repository> - <id>typesafe-repo</id> - <name>Typesafe Repository</name> - <url>http://repo.typesafe.com/typesafe/releases/</url> + <repository> + <id>maven-repo</id> <!-- This should be at top, it makes maven try the central repo first and then others and hence faster dep resolution --> + <name>Maven Repository</name> + <url>http://repo.maven.apache.org/maven2/</url> <releases> <enabled>true</enabled> </releases> @@ -138,17 +138,6 @@ <enabled>false</enabled> </snapshots> </repository> - <repository> - <id>akka-repo</id> - <name>Akka Repository</name> - <url>http://repo.akka.io/releases/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> <repository> <id>mqtt-repo</id> <name>MQTT Repository</name> @@ -161,41 +150,6 @@ </snapshots> </repository> </repositories> - <pluginRepositories> - <pluginRepository> - <id>oss-sonatype-releases</id> - <name>OSS Sonatype</name> - <url>https://oss.sonatype.org/content/repositories/releases</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - <pluginRepository> - <id>oss-sonatype-snapshots</id> - <name>OSS Sonatype</name> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - <pluginRepository> - <id>oss-sonatype</id> - <name>OSS Sonatype</name> - <url>https://oss.sonatype.org/content/groups/public</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> <dependencyManagement> <dependencies> diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index c983ea5dfb97b42f3aad337375444e1fc4fdc899..f8a17d93cccb168c5ed0fd4719db9985319c2c7f 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-repl-bin_${scala-short.version}</artifactId> + <artifactId>spark-repl-bin_2.10</artifactId> <packaging>pom</packaging> <name>Spark Project REPL binary packaging</name> <url>http://spark.incubator.apache.org/</url> diff --git a/repl/pom.xml b/repl/pom.xml index ff6649322911b0edef7b94bd4fce3abd9a256f05..2f27e767601d6676c33801501cf7d3217440b8b3 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-repl_${scala-short.version}</artifactId> + <artifactId>spark-repl_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project REPL</name> <url>http://spark.incubator.apache.org/</url> diff --git a/streaming/pom.xml b/streaming/pom.xml index fb15681e25cf853a876c6389511b9c63b1c77aaf..ff95591b9ff732329fe538c9e0de530df81ff54a 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming_${scala-short.version}</artifactId> + <artifactId>spark-streaming_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Streaming</name> <url>http://spark.incubator.apache.org/</url> diff --git a/tools/pom.xml b/tools/pom.xml index db87b54deca5529c9521027576a91c7fac18af98..353d201f902b9353ab950e9366c9149f31712501 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -25,7 +25,7 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-tools_${scala-short.version}</artifactId> + <artifactId>spark-tools_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Tools</name> <url>http://spark.incubator.apache.org/</url> diff --git a/yarn/pom.xml b/yarn/pom.xml index 12bc97da8a66b33fd19b67e61fe7027b76910d0f..5cf81575c95f4eed40c783060512e4574826466f 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -25,7 +25,7 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn_${scala-short.version}</artifactId> + <artifactId>spark-yarn_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project YARN Support</name> <url>http://spark.incubator.apache.org/</url>