summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-04-30 21:19:23 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2015-04-30 21:50:05 +0200
commit9cd3e6505aa4285750e63263e2551ab71f36ff8d (patch)
tree7d55af6ac02022e0160d5b8e289b700cf6d4c6d2 /scripts
parent4210262867a541d4cbf0aaf2b06bedeef9520c2b (diff)
downloadscala-9cd3e6505aa4285750e63263e2551ab71f36ff8d.tar.gz
scala-9cd3e6505aa4285750e63263e2551ab71f36ff8d.tar.bz2
scala-9cd3e6505aa4285750e63263e2551ab71f36ff8d.zip
remove references to private-repo.typesafe.com
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/jobs/integrate/bootstrap25
1 files changed, 6 insertions, 19 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap
index 3b25b2c45d..c97ca6493a 100755
--- a/scripts/jobs/integrate/bootstrap
+++ b/scripts/jobs/integrate/bootstrap
@@ -72,26 +72,13 @@
# Requirements
# - sbtCmd must point to sbt from sbt-extras
-# - ~/.sonatype-curl that consists of user = USER:PASS
-# - ~/.m2/settings.xml with credentials for sonatype
-# <server>
-# <id>private-repo</id>
-# <username>jenkinside</username>
-# <password></password>
-# </server>
-# - ~/.credentials (for sonatype)
-# realm=Sonatype Nexus Repository Manager
-# host=oss.sonatype.org
-# user=lamp
-# password=
-# - ~/.credentials-private-repo for private-repo.typesafe.com, as follows:
-# realm=Artifactory Realm
-# host=private-repo.typesafe.com
-# user=jenkinside
-# password=
-# - ~/.sbt/0.13/plugins/gpg.sbt with:
+# - ~/.sonatype-curl, ~/.m2/settings.xml, ~/.credentials, ~/.credentials-sonatype, ~/.credentials-private-repo
+# as defined by https://github.com/scala/scala-jenkins-infra/tree/master/templates/default
+# - ~/.sbt/0.13/plugins/gpg.sbt with:
# addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
+# Note: private-repo used to be private-repo.typesafe.com. now we're running artifactory on scala-ci.typesafe.com/artifactory
+
moduleVersioning=${moduleVersioning-"versions.properties"}
@@ -124,7 +111,7 @@ mkdir -p $baseDir/resolutionScratch_
# repo used to publish "locker" scala to (to start the bootstrap)
releaseTempRepoCred="private-repo"
-releaseTempRepoUrl=${releaseTempRepoUrl-"http://private-repo.typesafe.com/typesafe/scala-release-temp/"}
+releaseTempRepoUrl=${releaseTempRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-release-temp/"}
# 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.