diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2015-01-20 16:10:35 +0100 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2015-01-20 16:10:35 +0100 |
| commit | 5b347c51632c5724e5efaa0cdf473954289d7f4e (patch) | |
| tree | 104db466494a6e94400cfc9aae833798e85f6cea | |
| parent | 783c5ccfe7c2b22f1a1bdf6530028eac0d941702 (diff) | |
| parent | 85f3548b1b7254f7de555dd7c801b9b7f9101d13 (diff) | |
| download | scala-5b347c51632c5724e5efaa0cdf473954289d7f4e.tar.gz scala-5b347c51632c5724e5efaa0cdf473954289d7f4e.tar.bz2 scala-5b347c51632c5724e5efaa0cdf473954289d7f4e.zip | |
Merge pull request #4247 from adriaanm/2.11.5-bump
2.11.5 bump
| -rw-r--r-- | build.number | 6 | ||||
| -rwxr-xr-x | scripts/jobs/scala-release-2.11.x-build | 5 | ||||
| -rw-r--r-- | versions.properties | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/build.number b/build.number index dc85ecb777..5f8ed6d6b6 100644 --- a/build.number +++ b/build.number @@ -1,9 +1,9 @@ #Tue Sep 11 19:21:09 CEST 2007 version.major=2 version.minor=11 -version.patch=5 +version.patch=6 # This is the -N part of a version. if it's 0, it's dropped from maven versions. version.bnum=0 -# Note: To build a release run ant with -Dbuild.release=true -# To build an RC, run ant with -Dmaven.version.suffix=-RCN +# To build a release, see scripts/jobs/scala-release-2.11.x-build +# (normally run by the eponymous job on scala-ci.typesafe.com).
\ No newline at end of file diff --git a/scripts/jobs/scala-release-2.11.x-build b/scripts/jobs/scala-release-2.11.x-build index 21fbb8fa76..09a97dc34b 100755 --- a/scripts/jobs/scala-release-2.11.x-build +++ b/scripts/jobs/scala-release-2.11.x-build @@ -1,4 +1,9 @@ #!/bin/bash -e +# TODO: different scripts for the different phases -- usually we don't need to bootstrap the modules, +# since we can use the previous version of scala for STARR as well as for compiling the modules (assuming it's binary compatible) +# We should move away from the complicated bootstrap and set up our release schedule so we always have a previous build that satisfies these criteria. +# (Potentially trivially, by splitting up this script, and publishing locker as if it were a real release.) + # requirements: # sbtCmd must point to sbt from sbt-extras (this is the standard on the Scala jenkins, so we only support that one) # - ~/.sonatype-curl that consists of user = USER:PASS diff --git a/versions.properties b/versions.properties index a474b19c5b..9e2e6cea79 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.2 +starr.version=2.11.5 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.2 +scala.full.version=2.11.5 # external modules shipped with distribution, as specified by scala-library-all's pom scala-xml.version.number=1.0.3 |