diff options
| -rw-r--r-- | project/SparkBuild.scala | 2 | ||||
| -rw-r--r-- | project/build.properties | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 09b527c76a..4f5a3a224f 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", diff --git a/project/build.properties b/project/build.properties index 4b52bb928a..bcde13f436 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 |