summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-03-02 13:33:37 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-03-02 15:06:19 -0800
commit6b304a862a515e1b0a9e134645ab3632535166d3 (patch)
tree017ea43221d9d24ad71561e9504139d6fa32c021
parent52d4a5ac00af05648d3afae79b7428ef19ae5c21 (diff)
downloadscala-6b304a862a515e1b0a9e134645ab3632535166d3.tar.gz
scala-6b304a862a515e1b0a9e134645ab3632535166d3.tar.bz2
scala-6b304a862a515e1b0a9e134645ab3632535166d3.zip
Bump versions after 2.11.6 release.
-rw-r--r--build.number2
-rw-r--r--versions.properties4
2 files changed, 3 insertions, 3 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/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