Merge branch '1.1.x' into merge-1.1.x-into-1.x

* 1.1.x:
  Update version/mimaPreviousArtifacts/sbt.version
  clarify intent
  avoid deadlocks on spotty connections, fix https://github.com/sbt/sbt/issues/3738
  Add version 1.1.2 to mimaPreviousArtifacts

build.sbt

@@ -2,8 +2,6 @@ import Dependencies._
 import Path._
 //import com.typesafe.tools.mima.core._, ProblemFilters._
 
-def baseVersion = "1.0.0-SNAPSHOT"
-
 def commonSettings: Seq[Setting[_]] = Seq(
   scalaVersion := scala212,
   // publishArtifact in packageDoc := false,
@@ -32,7 +30,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
 val mimaSettings = Def settings (
   mimaPreviousArtifacts := Set(
     "1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4",
-    "1.1.0", "1.1.1",
+    "1.1.0", "1.1.1", "1.1.2", "1.1.3",
   ) map (version =>
     organization.value %% moduleName.value % version
       cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
@@ -61,7 +59,7 @@ lazy val lmRoot = (project in file("."))
         },
         bintrayPackage := "librarymanagement",
         scalafmtOnCompile in Sbt := false,
-        git.baseVersion := baseVersion,
+        git.baseVersion := "1.2.0",
         version := {
           val v = version.value
           if (v contains "SNAPSHOT") git.baseVersion.value

ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala

@@ -38,7 +38,10 @@ private[sbt] class ParallelResolveEngine(settings: ResolveEngineSettings,
     val allDownloads = dependencies.par.flatMap { dep =>
       if (!(dep.isCompletelyEvicted || dep.hasProblem) &&
           dep.getModuleRevision != null) {
-        ParArray(downloadNodeArtifacts(dep, artifactFilter, options))
+        //don't block in global ec to avoid deadlocks
+        scala.concurrent.blocking {
+          ParArray(downloadNodeArtifacts(dep, artifactFilter, options))
+        }
       } else ParArray.empty[DownloadResult]
     }
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.1.0
+sbt.version=1.1.1