From 2f45c88d14b8717bc45d5061b2a3c20f5afecda0 Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Thu, 30 Apr 2015 21:19:23 +0200 Subject: [backport] remove references to private-repo.typesafe.com Backport of 9cd3e6505aa4285750e63263e2551ab71f36ff8d --- scripts/jobs/integrate/bootstrap | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'scripts/jobs/integrate') diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index 310f1b2f40..6f104d79d4 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 -# -# private-repo -# jenkinside -# -# -# - ~/.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. -- cgit v1.2.3