Merge pull request #1964 from sbt/fix/1958

Various workarounds to get Travis CI less flaky

.travis.yml

@@ -20,8 +20,6 @@ env:
     - SCRIPTED_TEST="scripted compiler-project/*""
     - SCRIPTED_TEST="scripted dependency-management/*1of2"
     - SCRIPTED_TEST="scripted dependency-management/*2of2"
-    - SCRIPTED_TEST="mavenResolverPluginTest:scripted dependency-management/*1of2 project/transitive-plugins"
-    - SCRIPTED_TEST="mavenResolverPluginTest:scripted dependency-management/*2of2"
     - SCRIPTED_TEST="scripted java/*"
     - SCRIPTED_TEST="scripted package/*"
     - SCRIPTED_TEST="scripted project/*1of2"
@@ -35,6 +33,8 @@ env:
     - SCRIPTED_TEST="scripted project-load/*"
     - SCRIPTED_TEST="safeUnitTests"
     - SCRIPTED_TEST="checkBuildScala211"
+    # - SCRIPTED_TEST="mavenResolverPluginTest:scripted dependency-management/*1of2 project/transitive-plugins"
+    # - SCRIPTED_TEST="mavenResolverPluginTest:scripted dependency-management/*2of2"
 
 notifications:
   email:

sbt-maven-resolver/src/main/scala/sbt/mavenint/MavenRepositoryResolver.scala

@@ -259,7 +259,7 @@ abstract class MavenRepositoryResolver(settings: IvySettings) extends AbstractRe
     // Here we add in additional artifact requests, which ALLWAYS have to be explicit since
     // Maven/Aether doesn't include all known artifacts in a pom.xml
     // TODO - This does not appear to be working correctly.
-    if (dd.getAllDependencyArtifacts.isEmpty) { 
+    if (dd.getAllDependencyArtifacts.isEmpty) {
       val artifactId = s"${drid.getName}-${drid.getRevision}"
       // Add the artifacts we know about the module
       packaging match {

sbt/src/sbt-test/dependency-management/mvn-local/test

@@ -43,4 +43,5 @@ $ copy-file changes/libDeps.sbt library/build.sbt
 > library/publishM2
 
 # should succeed now that the dependency is there
+$ sleep 1000
 > main/compile