Merge pull request apache#81 from sun-rui/SparkR-117

shivaram · shivaram · commit 67d067a206e6 · 2014-09-24T22:37:31.000-07:00
[SPARKR-117] Update Spark dependency to 1.1.0
diff --git a/pkg/src/Makefile b/pkg/src/Makefile
@@ -28,7 +28,7 @@ $(SBT_TARGET_NAME): build.sbt $(SCALA_FILES) $(RESOURCE_FILES)
 	./sbt/sbt assembly
 	cp -f $(SBT_TARGET_NAME) ../inst/
 
-$(MAVEN_TARGET_NAME): $(SCALA_FILES) $(RESOURCE_FILES)
+$(MAVEN_TARGET_NAME): pom.xml $(SCALA_FILES) $(RESOURCE_FILES)
 	mvn -Dhadoop.version=$(SPARK_HADOOP_VERSION) -DskipTests clean package shade:shade
 	cp -f $(MAVEN_TARGET_NAME) ../inst/$(JAR_NAME)
 
diff --git a/pkg/src/build.sbt b/pkg/src/build.sbt
@@ -17,7 +17,7 @@ scalaVersion := "2.10.3"
 libraryDependencies ++= Seq(
   "org.slf4j" % "slf4j-api" % "1.7.2",
   "org.slf4j" % "slf4j-log4j12" % "1.7.2",
-  "org.apache.spark" % "spark-core_2.10" % "0.9.0-incubating"
+  "org.apache.spark" % "spark-core_2.10" % "1.1.0"
 )
 
 {
diff --git a/pkg/src/pom.xml b/pkg/src/pom.xml
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_2.10</artifactId>
-      <version>0.9.0-incubating</version>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ scalaVersion := "2.10.3"`
`17`	`17`	`libraryDependencies ++= Seq(`
`18`	`18`	`"org.slf4j" % "slf4j-api" % "1.7.2",`
`19`	`19`	`"org.slf4j" % "slf4j-log4j12" % "1.7.2",`
`20`		`- "org.apache.spark" % "spark-core_2.10" % "0.9.0-incubating"`
	`20`	`+ "org.apache.spark" % "spark-core_2.10" % "1.1.0"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`{`