diff --git a/build.sbt b/build.sbt
index c549bb69b..5c69b7bbd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -19,11 +19,10 @@ def buildLevelSettings: Seq[Setting[_]] = inThisBuild(Seq(
 ))
 
 def commonSettings: Seq[Setting[_]] = Seq[SettingsDefinition](
-  scalaVersion := scala210,
+  scalaVersion := scala211,
   publishArtifact in packageDoc := false,
   publishMavenStyle := false,
   componentID := None,
-  crossPaths := false,
   resolvers += Resolver.typesafeIvyRepo("releases"),
   resolvers += Resolver.sonatypeRepo("snapshots"),
   resolvers += Resolver.bintrayRepo("sbt", "maven-releases"),
@@ -31,7 +30,7 @@ def commonSettings: Seq[Setting[_]] = Seq[SettingsDefinition](
   testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
   javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"),
   incOptions := incOptions.value.withNameHashing(true),
-  crossScalaVersions := Seq(scala210),
+  crossScalaVersions := Seq(scala211),
   bintrayPackage := (bintrayPackage in ThisBuild).value,
   bintrayRepository := (bintrayRepository in ThisBuild).value,
   mimaDefaultSettings,
@@ -77,6 +76,7 @@ lazy val bundledLauncherProj =
     description := "sbt application launcher",
     publishArtifact in packageSrc := false,
     autoScalaLibrary := false,
+    crossPaths := false,
     publish := Release.deployLauncher.value,
     publishLauncher := Release.deployLauncher.value,
     packageBin in Compile := sbtLaunchJar.value
@@ -199,15 +199,15 @@ lazy val sbtProj = (project in sbtPath).
     libraryDependencies ++= Seq(compilerBrdige)
   )
 
-lazy val mavenResolverPluginProj = (project in file("sbt-maven-resolver")).
-  dependsOn(sbtProj).
-  settings(
-    baseSettings,
-    sbtBinaryVersion := "1.0.0-SNAPSHOT",
-    name := "sbt-maven-resolver",
-    libraryDependencies ++= aetherLibs ++ Seq(utilTesting % Test, (libraryManagement % Test).classifier("tests"), libraryManagement % Test),
-    sbtPlugin := true
-  )
+// lazy val mavenResolverPluginProj = (project in file("sbt-maven-resolver")).
+//   dependsOn(sbtProj).
+//   settings(
+//     baseSettings,
+//     sbtBinaryVersion := "1.0.0-SNAPSHOT",
+//     name := "sbt-maven-resolver",
+//     libraryDependencies ++= aetherLibs ++ Seq(utilTesting % Test, (libraryManagement % Test).classifier("tests"), libraryManagement % Test),
+//     sbtPlugin := true
+//   )
 
 def scriptedTask: Def.Initialize[InputTask[Unit]] = Def.inputTask {
   val result = scriptedSource(dir => (s: State) => Scripted.scriptedParser(dir)).parsed
@@ -231,7 +231,7 @@ lazy val myProvided = config("provided") intransitive
 def allProjects = Seq(
   testingProj, testAgentProj, taskProj, stdTaskProj, runProj,
   scriptedSbtProj, scriptedPluginProj,
-  actionsProj, commandProj, mainSettingsProj, mainProj, sbtProj, bundledLauncherProj, mavenResolverPluginProj)
+  actionsProj, commandProj, mainSettingsProj, mainProj, sbtProj, bundledLauncherProj)
 
 def projectsWithMyProvided = allProjects.map(p => p.copy(configurations = (p.configurations.filter(_ != Provided)) :+ myProvided))
 lazy val nonRoots = projectsWithMyProvided.map(p => LocalProject(p.id))
@@ -259,7 +259,7 @@ def otherRootSettings = Seq(
   }
 ))
 lazy val docProjects: ScopeFilter = ScopeFilter(
-  inAnyProject -- inProjects(sbtRoot, sbtProj, scriptedSbtProj, scriptedPluginProj, mavenResolverPluginProj),
+  inAnyProject -- inProjects(sbtRoot, sbtProj, scriptedSbtProj, scriptedPluginProj),
   inConfigurations(Compile)
 )
 def fullDocSettings = Util.baseScalacOptions ++ Docs.settings ++ Sxr.settings ++ Seq(
@@ -295,7 +295,7 @@ lazy val otherProjects: ScopeFilter = ScopeFilter(
     testingProj, testAgentProj, taskProj,
     scriptedSbtProj, scriptedPluginProj,
     commandProj, mainSettingsProj, mainProj,
-    sbtProj, mavenResolverPluginProj),
+    sbtProj),
   inConfigurations(Test)
 )
 
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index c077f4afd..6b598faa6 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -6,7 +6,7 @@ object Dependencies {
   lazy val scala292 = "2.9.2"
   lazy val scala293 = "2.9.3"
   lazy val scala210 = "2.10.6"
-  lazy val scala211 = "2.11.7"
+  lazy val scala211 = "2.11.8"
 
   // sbt modules
   val utilVersion = "0.1.0-M10"