Repository: spark Updated Branches: refs/heads/branch-1.0 e5130d978 -> 1ea9a21f4
[SPARK-959] Updated SBT from 0.13.1 to 0.13.2 JIRA issue: [SPARK-959](https://spark-project.atlassian.net/browse/SPARK-959) SBT 0.13.2 has been officially released. This version updated Ivy 2.0 to Ivy 2.3, which fixes [IVY-899](https://issues.apache.org/jira/browse/IVY-899). This PR also removed previous workaround. Author: Cheng Lian <lian.cs....@gmail.com> Closes #426 from liancheng/updateSbt and squashes the following commits: 95e3dc8 [Cheng Lian] Updated SBT from 0.13.1 to 0.13.2 to fix SPARK-959 (cherry picked from commit 6a10d801626f1513b1b349b54ba0e2e6bf55c7e2) Signed-off-by: Patrick Wendell <pwend...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1ea9a21f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1ea9a21f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1ea9a21f Branch: refs/heads/branch-1.0 Commit: 1ea9a21f4baaeb7fc64596ab166d1aa95d580251 Parents: e5130d9 Author: Cheng Lian <lian.cs....@gmail.com> Authored: Wed Apr 16 08:52:14 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Wed Apr 16 08:52:28 2014 -0700 ---------------------------------------------------------------------- project/SparkBuild.scala | 2 -- project/build.properties | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1ea9a21f/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 09b527c..4f5a3a2 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -263,8 +263,6 @@ object SparkBuild extends Build { "org.eclipse.jetty" % "jetty-util" % jettyVersion, "org.eclipse.jetty" % "jetty-plus" % jettyVersion, "org.eclipse.jetty" % "jetty-security" % jettyVersion, - /** Workaround for SPARK-959. Dependency used by org.eclipse.jetty. Fixed in ivy 2.3.0. */ - "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" artifacts Artifact("javax.servlet", "jar", "jar"), "org.scalatest" %% "scalatest" % "1.9.1" % "test", "org.scalacheck" %% "scalacheck" % "1.10.0" % "test", "com.novocode" % "junit-interface" % "0.10" % "test", http://git-wip-us.apache.org/repos/asf/spark/blob/1ea9a21f/project/build.properties ---------------------------------------------------------------------- diff --git a/project/build.properties b/project/build.properties index 4b52bb9..bcde13f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -sbt.version=0.13.1 +sbt.version=0.13.2
