Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit 79927f9

Browse files
committed
Subst repo.typesafe -> dl.bintray, use jcenter cache
Switch to https while we're at it, and remove duplicate entry for sbt-plugin-releases (NOTE: 'organization' <-> 'organisation', see http://ant.apache.org/ivy/history/latest-milestone/concept.html#patterns)
1 parent 3a0462e commit 79927f9

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

scripts/jobs/integrate/bootstrap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,18 @@ mkdir -p $baseDir/resolutionScratch_
114114
# repo used to publish "locker" scala to (to start the bootstrap)
115115
releaseTempRepoCred="private-repo"
116116
releaseTempRepoUrl=${releaseTempRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-release-temp/"}
117+
jcenterCacheUrl=${jcenterCacheUrl-"https://scala-ci.typesafe.com/artifactory/jcenter/"}
117118

118119
# Used below in sbtArgs since we use a dedicated repository to share artifcacts between jobs,
119120
# so we need to configure SBT to use these rather than its default, Maven Central.
120121
# See http://www.scala-sbt.org/0.13/docs/Proxy-Repositories.html
121122
sbtRepositoryConfig="$scriptsDir/repositories-scala-release"
122123
cat > "$sbtRepositoryConfig" << EOF
123124
[repositories]
124-
plugins: http://dl.bintray.com/sbt/sbt-plugin-releases/, [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]
125125
private-repo: $releaseTempRepoUrl
126-
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
127-
sbt-plugin-releases: http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]
126+
jcenter-cache: $jcenterCacheUrl
127+
typesafe-ivy-releases: https://dl.bintray.com/typesafe/ivy-releases/, [organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
128+
sbt-plugin-releases: https://dl.bintray.com/sbt/sbt-plugin-releases/, [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]
128129
maven-central
129130
local
130131
EOF

tools/binary-repo-lib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#
33
# Library to push and pull binary artifacts from a remote repository using CURL.
44

5-
remote_urlget="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
6-
remote_urlpush="http://dl.bintray.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
5+
remote_urlget="https://dl.bintray.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
6+
remote_urlpush="https://dl.bintray.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
77
libraryJar="$(pwd)/lib/scala-library.jar"
88
desired_ext=".desired.sha1"
99
push_jar="$(pwd)/tools/push.jar"

0 commit comments

Comments
 (0)