diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:36:04 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:36:04 +0200 |
| commit | d253702f9f23186cbf95f611c2fd1a2d08330ad6 (patch) | |
| tree | 9cd6198413ef8ea5e885559e4f3230373821c00c /scripts | |
| parent | 819a559173c65ccf80a856ef46bc8f1d5996740a (diff) | |
| parent | 297eeb335cbc50be9107d3f49cc7eb0487514ca7 (diff) | |
| download | scala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.tar.gz scala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.tar.bz2 scala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.zip | |
Merge commit '297eeb3' into merge-2.11-may-12
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index 56e23a51b4..ccc62c0d45 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -114,6 +114,7 @@ mkdir -p $baseDir/resolutionScratch_ # repo used to publish "locker" scala to (to start the bootstrap) releaseTempRepoCred="private-repo" releaseTempRepoUrl=${releaseTempRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-release-temp/"} +jcenterCacheUrl=${jcenterCacheUrl-"https://scala-ci.typesafe.com/artifactory/jcenter/"} # Used below in sbtArgs since we use a dedicated repository to share artifcacts between jobs, # so we need to configure SBT to use these rather than its default, Maven Central. @@ -121,10 +122,10 @@ releaseTempRepoUrl=${releaseTempRepoUrl-"https://scala-ci.typesafe.com/artifacto sbtRepositoryConfig="$scriptsDir/repositories-scala-release" cat > "$sbtRepositoryConfig" << EOF [repositories] - plugins: http://dl.bintray.com/sbt/sbt-plugin-releases/, [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext] private-repo: $releaseTempRepoUrl - typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly - sbt-plugin-releases: http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext] + jcenter-cache: $jcenterCacheUrl + typesafe-ivy-releases: https://dl.bintray.com/typesafe/ivy-releases/, [organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly + sbt-plugin-releases: https://dl.bintray.com/sbt/sbt-plugin-releases/, [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext] maven-central local EOF |