diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-03-24 13:55:10 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-03-24 13:55:10 +1000 |
| commit | f25a78e7c7e65d428b250d2b219e27119f2d6223 (patch) | |
| tree | 35fde33f332548441c83787d628d63253eb09f91 | |
| parent | fcc20fe4d3ac5caceb50965bc202b880e61f984c (diff) | |
| parent | b1b7f892e27d98601c7ced3b7f08e08b733dc284 (diff) | |
| download | scala-f25a78e7c7e65d428b250d2b219e27119f2d6223.tar.gz scala-f25a78e7c7e65d428b250d2b219e27119f2d6223.tar.bz2 scala-f25a78e7c7e65d428b250d2b219e27119f2d6223.zip | |
Merge pull request #4371 from adriaanm/2.11.6-bump
Bump versions after 2.11.6 release.
| -rw-r--r-- | build.number | 2 | ||||
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 4 | ||||
| -rw-r--r-- | versions.properties | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/build.number b/build.number index 5f8ed6d6b6..27d2d23041 100644 --- a/build.number +++ b/build.number @@ -1,7 +1,7 @@ #Tue Sep 11 19:21:09 CEST 2007 version.major=2 version.minor=11 -version.patch=6 +version.patch=7 # This is the -N part of a version. if it's 0, it's dropped from maven versions. version.bnum=0 diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index 46d610018c..d0a5b452a8 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 fa08e56346..096108a21f 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 |