diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-01 16:51:54 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-01 16:51:54 +0200 |
| commit | 51971954ace37ad6af8bf354d92f6baf51d16324 (patch) | |
| tree | 9a8ed2886dfaea8e1aa33ea6804b15aee3239874 | |
| parent | dcd9a83916f9e0128ef6869def82d4f23bdea0e0 (diff) | |
| parent | f25a78e7c7e65d428b250d2b219e27119f2d6223 (diff) | |
| download | scala-51971954ace37ad6af8bf354d92f6baf51d16324.tar.gz scala-51971954ace37ad6af8bf354d92f6baf51d16324.tar.bz2 scala-51971954ace37ad6af8bf354d92f6baf51d16324.zip | |
Merge commit 'f25a78e' into merge/2.11-to-2.12-apr-1
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 4 | ||||
| -rw-r--r-- | versions.properties | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index e2ddaeda55..0c1221d8eb 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -438,7 +438,6 @@ constructUpdatedModuleVersions() { if [ ! -z "$JLINE_VER" ] ; then updatedModuleVersions=("${updatedModuleVersions[@]}" "-Djline.version=$JLINE_VER"); fi if [ ! -z "$SCALA_BINARY_VER" ]; then updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala.binary.version=$SCALA_BINARY_VER"); fi - if [ ! -z "$SCALA_FULL_VER" ] ; then updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala.full.version=$SCALA_FULL_VER"); fi } # build locker (scala + modules) and quick, publishing everything to private-repo @@ -493,7 +492,10 @@ bootstrap() { cd $baseDir rm -rf build/ # must leave everything else in $baseDir for downstream jobs + # scala.full.version determines the dependency of scala-dist on the continuations plugin, + # which is fully cross-versioned (for $SCALA_VER, the version we're releasing) ant -Dstarr.version=$SCALA_VER\ + -Dscala.full.version=$SCALA_VER\ -Dextra.repo.url=$privateRepo\ -Dmaven.version.suffix=$SCALA_VER_SUFFIX\ ${updatedModuleVersions[@]} \ diff --git a/versions.properties b/versions.properties index 6f7fb95ac4..84e9078815 100644 --- a/versions.properties +++ b/versions.properties @@ -4,7 +4,7 @@ # 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 -starr.version=2.11.5 +starr.version=2.11.6 starr.use.released=1 # These are the versions of the modules that go with this release. @@ -14,7 +14,7 @@ starr.use.released=1 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.5 +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 |