Using new release candidate

kael-aiur · May 24, 2015 · 61aaf46 · 61aaf46
1 parent 55f1610
commit 61aaf46
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -273,7 +273,7 @@
     <repository>
       <id>spark-1.4-staging</id>
       <name>Spark 1.4 RC1 Staging Repository</name>
-      <url>https://repository.apache.org/content/repositories/orgapachespark-1092</url>
+      <url>https://repository.apache.org/content/repositories/orgapachespark-1104</url>
       <releases>
         <enabled>true</enabled>
       </releases>

diff --git a/project/MimaBuild.scala b/project/MimaBuild.scala
@@ -91,7 +91,8 @@ object MimaBuild {
 
   def mimaSettings(sparkHome: File, projectRef: ProjectRef) = {
     val organization = "org.apache.spark"
-    val previousSparkVersion = "1.4.0"
+    // TODO: Change this once Spark 1.4.0 is released
+    val previousSparkVersion = "1.4.0-rc2"
     val fullId = "spark-" + projectRef.project + "_2.10"
     mimaDefaultSettings ++
     Seq(previousArtifact := Some(organization % fullId % previousSparkVersion),

diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
@@ -43,15 +43,7 @@ object MimaExcludes {
             MimaBuild.excludeSparkPackage("unused"),
             // SPARK-7805 - Some SQL test code accidentally included in src/main 
             ProblemFilters.exclude[MissingMethodProblem](
-              "org.apache.spark.sql.test.SQLTestUtils.withTable"),
-            // TODO: REMOVE THESE AFTER 1.4 IS RELEASED - Transient changes in 1.4
-            ProblemFilters.exclude[MissingClassProblem](
-              "org.apache.spark.status.api.v1.JsonRootResource"),
-            ProblemFilters.exclude[MissingClassProblem](
-              "org.apache.spark.status.api.v1.JsonRootResource$"),
-            ProblemFilters.exclude[MissingMethodProblem](
-              "org.apache.spark.streaming.StreamingContext.withNamedScope"),
-            excludePackage("org.apache.spark.sql.sources.HadoopFsRelation") 
+              "org.apache.spark.sql.test.SQLTestUtils.withTable")
           )
         case v if v.startsWith("1.4") =>
           Seq(