diff options
| -rw-r--r-- | assembly/pom.xml | 2 | ||||
| -rw-r--r-- | bagel/pom.xml | 2 | ||||
| -rw-r--r-- | core/pom.xml | 2 | ||||
| -rw-r--r-- | examples/pom.xml | 2 | ||||
| -rw-r--r-- | mllib/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 56 | ||||
| -rw-r--r-- | repl-bin/pom.xml | 2 | ||||
| -rw-r--r-- | repl/pom.xml | 2 | ||||
| -rw-r--r-- | streaming/pom.xml | 2 | ||||
| -rw-r--r-- | tools/pom.xml | 2 | ||||
| -rw-r--r-- | yarn/pom.xml | 2 |
11 files changed, 15 insertions, 61 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index 28b0692dff..8103534796 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 c8b9c4f4cd..461e76a753 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 e2033c9912..af605e1837 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 a10dee7847..464ad82e33 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 a57bddeff3..fce5b19bb2 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> @@ -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> @@ -139,17 +139,6 @@ </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> <url>https://repo.eclipse.org/content/repositories/paho-releases/</url> @@ -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 c983ea5dfb..f8a17d93cc 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 ff66493229..2f27e76760 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 fb15681e25..ff95591b9f 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 db87b54dec..353d201f90 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 12bc97da8a..5cf81575c9 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> |