Merge branch '2.12.x' into 2.13.x

Author: lrytz

repositories

@@ -13,10 +13,12 @@ echo "Scala version:" $version
 
 rm -rf $scriptDir/ivy2
 
+integrationRepoUrl="https://scala-ci.typesafe.com/artifactory/scala-integration/"
+sonatypeStagingUrl="https://oss.sonatype.org/content/repositories/staging/"
+
 sbt \
   -Dsbt.log.noformat=true \
   -Dsbt.ivy.home=$scriptDir/ivy2 \
-  -Dsbt.override.build.repos=true \
-  -Dsbt.repository.config=repositories \
   -Dproject.version=$version \
+  "set resolvers ++= List(\"scala-integration\" at \"$integrationRepoUrl\", \"sonatype-staging\" at \"$sonatypeStagingUrl\")" \
   clean run

run-locally

@@ -28,9 +28,10 @@ clearIvyCache
 sbtDistVersionOverride="-Dproject.version=$version"
 
 integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"}
+sonatypeStagingUrl="https://oss.sonatype.org/content/repositories/staging/"
 
 sbt -Dsbt.log.noformat=true \
-  "set resolvers += \"scala-integration\" at \"$integrationRepoUrl\"" \
+  "set resolvers ++= List(\"scala-integration\" at \"$integrationRepoUrl\", \"sonatype-staging\" at \"$sonatypeStagingUrl\")" \
   $sbtDistVersionOverride \
   clean run