Merge pull request scala#4492 from lrytz/scriptsBackport

Backport releas script fixes to 2.11.x

Author: retronym

README.md

@@ -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
 ```

build.number

@@ -1,9 +1,13 @@
-#Tue Sep 11 19:21:09 CEST 2007
+# The version number in this file should be the next un-released minor version,
+# e.g., 2.11.7, 2.12.0, 2.12.1. It's used to determine version numbers for
+# SNAPSHOT / nightly builds and local builds of source checkouts.
+
 version.major=2
 version.minor=11
 version.patch=7
-# This is the -N part of a version.  if it's 0, it's dropped from maven versions.
+
+# This is the -N part of a version (2.9.1-1). If it's 0, it's dropped from maven versions. It should not be used again.
 version.bnum=0
 
 # To build a release, see scripts/jobs/scala-release-2.11.x-build
-# (normally run by the eponymous job on scala-ci.typesafe.com).
+# (normally run by the eponymous job on scala-ci.typesafe.com).

build.xml

@@ -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 -->

scripts/jobs/integrate/bootstrap

@@ -11,7 +11,7 @@ case $prDryRun in
     # (in that sense it's locker, since it was built with starr by that upstream job)
     ant -Dstarr.version=$scalaVersion \
        -Dscalac.args.optimise=-optimise \
-       -Dlocker.skip=1 -Dstarr.use.released=1 -Dextra.repo.url=$prRepoUrl \
+       -Dlocker.skip=1 -Dextra.repo.url=$prRepoUrl \
        $testExtraArgs ${testTarget-test.core docs.done}
     ;;
 esac

scripts/jobs/validate/test

@@ -33,7 +33,7 @@ package scala.collection.immutable.redblacktree {
 
     def mkTree(level: Int, parentIsBlack: Boolean = false, label: String = ""): Gen[Tree[String, Int]] =
       if (level == 0) {
-        value(null)
+        const(null)
       } else {
         for {
           oddOrEven <- choose(0, 2)

test/files/scalacheck/redblacktree.scala

@@ -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"

tools/binary-repo-lib.sh

@@ -3,32 +3,40 @@
 # via scala-dist-pom.xml and scala-library-all-pom.xml
 # when adding new properties that influence a release,
 # also add them to the update.versions mechanism in build.xml,
-# which is used by scala-release-2.11.x in scala/jenkins-scripts
+# which is used by the release script scripts/jobs/integrate/bootstrap
+
+# The scala version used for boostrapping. This has no impact on the final classfiles:
+# there are two stages (locker and quick), so compiler and library are always built
+# with themselves. Stability is ensured by building a third stage (strap).
 starr.version=2.11.6
-starr.use.released=1
 
 # These are the versions of the modules that go with this release.
 # These properties are used during PR validation and in dbuild builds.
 
-# e.g. 2.11.0-RC1, 2.11
+# The scala.binary.version determines how modules are resolved. For example, it
+# determines which partest artifact is being used for running the tests.
+# It has to be set in the following way:
+#  - After 2.x.0 is released, the binary version is 2.x.
+#  - During milestones and RCs, modules are cross-built against the full version.
+#    So the value is the full version (e.g. 2.12.0-M1).
 scala.binary.version=2.11
 # e.g. 2.11.0-RC1, 2.11.0, 2.11.1-RC1, 2.11.1
 # this defines the dependency on scala-continuations-plugin in scala-dist's pom
 scala.full.version=2.11.6
 
 # external modules shipped with distribution, as specified by scala-library-all's pom
-scala-xml.version.number=1.0.3
-scala-parser-combinators.version.number=1.0.3
+scala-xml.version.number=1.0.4
+scala-parser-combinators.version.number=1.0.4
 scala-continuations-plugin.version.number=1.0.2
 scala-continuations-library.version.number=1.0.2
-scala-swing.version.number=1.0.1
-akka-actor.version.number=2.3.4
+scala-swing.version.number=1.0.2
+akka-actor.version.number=2.3.10
 actors-migration.version.number=1.1.0
 jline.version=2.12.1
 
 # external modules, used internally (not shipped)
-partest.version.number=1.0.6
-scalacheck.version.number=1.11.4
+partest.version.number=1.0.7
+scalacheck.version.number=1.11.6
 
 # TODO: modularize the compiler
 #scala-compiler-doc.version.number=1.0.0-RC1