Merge pull request #174 from lrytz/integration

[backport] new version numbers and repo for integration builds

Author: lrytz

conf/repositories

@@ -1,5 +1,5 @@
 [repositories]
-  private-repo: https://scala-ci.typesafe.com/artifactory/scala-release-temp/
+  scala-integration: https://scala-ci.typesafe.com/artifactory/scala-integration/
   jcenter-cache: https://scala-ci.typesafe.com/artifactory/jcenter/
   typesafe-ivy-releases: https://dl.bintray.com/typesafe/ivy-releases/, [organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
   sbt-plugin-releases: https://dl.bintray.com/sbt/sbt-plugin-releases/, [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]

scripts/jobs/release/website/archives

@@ -4,7 +4,7 @@ declare -a sshCharaArgs="$sshCharaArgs"
 
 url="http://downloads.lightbend.com/scala/$version"
 
-if [[ "$version" =~ .*-nightly ]]
+if [[ "$version" =~ ^.*-(bin|pre)-[0-9a-f]+$ ]]
 then archivesDir="~linuxsoft/archives/scala/nightly/2.11.x"
 else archivesDir="~linuxsoft/archives/scala"
 fi

scripts/jobs/release/website/update-api

@@ -2,7 +2,7 @@
 # need to re-declare it as an array, not sure how to do that directly in jenkins
 declare -a sshCharaArgs="$sshCharaArgs"
 
-if [[ "$version" =~ .*-nightly ]]
+if [[ "$version" =~ ^.*-(bin|pre)-[0-9a-f]+$ ]]
 then archivesDir="~linuxsoft/archives/scala/nightly/2.11.x"
 else archivesDir="~linuxsoft/archives/scala"
 fi