luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3408 from dwijnand/01316 

sbt 0.13.16
This commit is contained in:
eugene yokota 2017-09-08 16:42:26 -04:00 committed by GitHub
parent b5f9fe215e d864b066a3
commit e3c4db5ae8
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -16,6 +16,11 @@ jdk:
- openjdk6 - openjdk6
# - oraclejdk7 # - 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: env:
matrix: matrix:
- SBT_CMD=";doc;safeUnitTests" - SBT_CMD=";doc;safeUnitTests"

2
build.sbt
View File

@ -487,7 +487,7 @@ lazy val sbtProj = (project in sbtPath).
lazy val mavenResolverPluginProj = (project in file("sbt-maven-resolver")). lazy val mavenResolverPluginProj = (project in file("sbt-maven-resolver")).
dependsOn(sbtProj, ivyProj % "test->test"). dependsOn(sbtProj, ivyProj % "test->test").
settings( settings(
baseSettings, testedBaseSettings,
name := "sbt-maven-resolver", name := "sbt-maven-resolver",
libraryDependencies ++= aetherLibs, libraryDependencies ++= aetherLibs,
sbtPlugin := true sbtPlugin := true

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=0.13.16-M1 sbt.version=0.13.16

0
sbt/src/sbt-test/tests/fork-parallel/test → sbt/src/sbt-test/tests/fork-parallel/pending
View File