diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-30 21:19:23 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-06 09:29:12 +0200 |
commit | 2f45c88d14b8717bc45d5061b2a3c20f5afecda0 (patch) | |
tree | 9d86c066ff50e6cd468a0c8804587412de42291d | |
parent | 008ccfed3485d960a7bc3f69e73e6411421367d8 (diff) | |
download | scala-2f45c88d14b8717bc45d5061b2a3c20f5afecda0.tar.gz scala-2f45c88d14b8717bc45d5061b2a3c20f5afecda0.tar.bz2 scala-2f45c88d14b8717bc45d5061b2a3c20f5afecda0.zip |
[backport] remove references to private-repo.typesafe.com
Backport of 9cd3e6505aa4285750e63263e2551ab71f36ff8d
-rw-r--r-- | README.md | 2 | ||||
-rwxr-xr-x | build.xml | 4 | ||||
-rwxr-xr-x | scripts/jobs/integrate/bootstrap | 25 | ||||
-rwxr-xr-x | tools/binary-repo-lib.sh | 2 |
4 files changed, 10 insertions, 23 deletions
@@ -97,7 +97,7 @@ Once the `publish-core` task has completed on a commit, you can try it out in sb ``` $ sbt -> set resolvers += "pr" at "http://private-repo.typesafe.com/typesafe/scala-pr-validation-snapshots/" +> set resolvers += "pr" at "https://scala-ci.typesafe.com/artifactory/scala-pr-validation-snapshots/" > set scalaVersion := "<milestone>-<sha7>-SNAPSHOT" > console ``` @@ -506,9 +506,9 @@ TODO: <property name="sbt.lib.dir" value="${build-sbt.dir}/${sbt.latest.version}/lib"/> <property name="sbt.interface.jar" value="${sbt.lib.dir}/interface.jar"/> - <property name="sbt.interface.url" value="http://private-repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/interface/${sbt.latest.version}/jars/interface.jar"/> + <property name="sbt.interface.url" value="http://dl.bintray.com/typesafe/ivy-releases/org.scala-sbt/interface/${sbt.latest.version}/jars/interface.jar"/> <property name="sbt.interface.src.jar" value="${sbt.src.dir}/compiler-interface-src.jar"/> - <property name="sbt.interface.src.url" value="http://private-repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/compiler-interface/${sbt.latest.version}/jars/compiler-interface-src.jar"/> + <property name="sbt.interface.src.url" value="http://dl.bintray.com/typesafe/ivy-releases/org.scala-sbt/compiler-interface/${sbt.latest.version}/jars/compiler-interface-src.jar"/> <!-- Additional command line arguments for scalac. They are added to all build targets --> 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 -# <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. diff --git a/tools/binary-repo-lib.sh b/tools/binary-repo-lib.sh index 84245ca54e..14c2c9464a 100755 --- a/tools/binary-repo-lib.sh +++ b/tools/binary-repo-lib.sh @@ -3,7 +3,7 @@ # Library to push and pull binary artifacts from a remote repository using CURL. remote_urlget="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" -remote_urlpush="http://private-repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" +remote_urlpush="http://dl.bintray.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" libraryJar="$(pwd)/lib/scala-library.jar" desired_ext=".desired.sha1" push_jar="$(pwd)/tools/push.jar" |