From 397d3aae5bde96b01b4968dde048b6898bb6c914 Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Tue, 18 Nov 2014 21:24:18 -0800
Subject: Bumping version to 1.3.0-SNAPSHOT.

Author: Marcelo Vanzin <vanzin@cloudera.com>

Closes #3277 from vanzin/version-1.3 and squashes the following commits:

7c3c396 [Marcelo Vanzin] Added temp repo to sbt build.
5f404ff [Marcelo Vanzin] Add another exclusion.
19457e7 [Marcelo Vanzin] Update old version to 1.2, add temporary 1.2 repo.
3c8d705 [Marcelo Vanzin] Workaround for MIMA checks.
e940810 [Marcelo Vanzin] Bumping version to 1.3.0-SNAPSHOT.
---
 pom.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 94c4422743..6c1c1214a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
   </parent>
   <groupId>org.apache.spark</groupId>
   <artifactId>spark-parent</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Spark Project Parent POM</name>
   <url>http://spark.apache.org/</url>
@@ -254,6 +254,18 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <!-- TODO: remove this as soon as 1.2.0 is published on Maven central -->
+    <repository>
+      <id>spark-staging-1038</id>
+      <name>Spark 1.2.0 Staging (1038)</name>
+      <url>https://repository.apache.org/content/repositories/orgapachespark-1038/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -269,7 +281,7 @@
   </pluginRepositories>
 
   <dependencies>
-  <!-- 
+  <!--
        This is a dummy dependency that is used along with the shading plug-in
        to create effective poms on publishing (see SPARK-3812).
   -->
@@ -278,7 +290,7 @@
       <artifactId>unused</artifactId>
       <version>1.0.0</version>
     </dependency>
-    <!-- 
+    <!--
          This depndency has been added to provided scope as it is needed for excuting build
          specific groovy scripts using gmaven+ and not required for downstream project building
          with spark.
-- 
cgit v1.2.3