diff --git a/.travis.yml b/.travis.yml index c21be6ff3..e9cbed1d5 100644 --- a/.travis.yml +++ b/.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: diff --git a/sbt-maven-resolver/src/main/scala/sbt/mavenint/MavenRepositoryResolver.scala b/sbt-maven-resolver/src/main/scala/sbt/mavenint/MavenRepositoryResolver.scala index 6796efcd7..6ee17cced 100644 --- a/sbt-maven-resolver/src/main/scala/sbt/mavenint/MavenRepositoryResolver.scala +++ b/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 { diff --git a/sbt/src/sbt-test/dependency-management/eviction-warning/build.sbt b/sbt/src/sbt-test/dependency-management/gh-1484-npe/build.sbt similarity index 100% rename from sbt/src/sbt-test/dependency-management/eviction-warning/build.sbt rename to sbt/src/sbt-test/dependency-management/gh-1484-npe/build.sbt diff --git a/sbt/src/sbt-test/dependency-management/eviction-warning/test b/sbt/src/sbt-test/dependency-management/gh-1484-npe/pending similarity index 100% rename from sbt/src/sbt-test/dependency-management/eviction-warning/test rename to sbt/src/sbt-test/dependency-management/gh-1484-npe/pending diff --git a/sbt/src/sbt-test/dependency-management/mvn-local/test b/sbt/src/sbt-test/dependency-management/mvn-local/test index 2740387f2..190bf8a89 100644 --- a/sbt/src/sbt-test/dependency-management/mvn-local/test +++ b/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 diff --git a/sbt/src/sbt-test/project/session-save/test b/sbt/src/sbt-test/project/session-save/pending similarity index 100% rename from sbt/src/sbt-test/project/session-save/test rename to sbt/src/sbt-test/project/session-save/pending