Merge pull request #3408 from dwijnand/01316

sbt 0.13.16
2017-09-08 16:42:26 -04:00 · 2017-09-08 16:42:26 -04:00 · e3c4db5ae8
parent b5f9fe215e d864b066a3
commit e3c4db5ae8
4 changed files with 7 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -16,6 +16,11 @@ jdk:
  - openjdk6
 #  - oraclejdk7

+# WORKAROUND https://github.com/travis-ci/travis-ci/issues/5227
+addons:
+  hosts: workaround-travis-ci-issue-5227
+  hostname: workaround-travis-ci-issue-5227
+
 env:
  matrix:
    - SBT_CMD=";doc;safeUnitTests"
--- a/build.sbt
+++ b/build.sbt
@ -487,7 +487,7 @@ lazy val sbtProj = (project in sbtPath).
 lazy val mavenResolverPluginProj = (project in file("sbt-maven-resolver")).
  dependsOn(sbtProj, ivyProj % "test->test").
  settings(
-    baseSettings,
+    testedBaseSettings,
    name := "sbt-maven-resolver",
    libraryDependencies ++= aetherLibs,
    sbtPlugin := true
--- a/project/build.properties
+++ b/project/build.properties
@ -1 +1 @@
-sbt.version=0.13.16-M1
+sbt.version=0.13.16
--- a/sbt/src/sbt-test/tests/fork-parallel/pending
+++ b/sbt/src/sbt-test/tests/fork-parallel/pending