diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-07-25 17:53:22 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-07-25 17:53:22 +0200 |
| commit | 5a878c2ed86e940bfff4b95b52b356a2c1146bb4 (patch) | |
| tree | e787db945df02eaa9235a2cf91c6730653aa65ef | |
| parent | 01f2d279e84fda300176e83ee94c17c08ad1dc3f (diff) | |
| parent | ef427b27ac598d890d42991b197aaab06ade580d (diff) | |
| download | scala-5a878c2ed86e940bfff4b95b52b356a2c1146bb4.tar.gz scala-5a878c2ed86e940bfff4b95b52b356a2c1146bb4.tar.bz2 scala-5a878c2ed86e940bfff4b95b52b356a2c1146bb4.zip | |
Merge pull request #3897 from lrytz/2.11.2-bump
Bump versions for Scala 2.11.2
| -rw-r--r-- | build.number | 2 | ||||
| -rw-r--r-- | versions.properties | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/build.number b/build.number index 4a0898529e..21ce660958 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=2 +version.patch=3 # 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 c334629d20..cd53a343f6 100644 --- a/versions.properties +++ b/versions.properties @@ -1,10 +1,10 @@ -#Tue, 20 May 2014 10:01:37 +0200 +#Wed, 23 Jul 2014 08:37:26 +0200 # NOTE: this file determines the content of the scala-distribution # 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 -starr.version=2.11.1 +starr.version=2.11.2 starr.use.released=1 # These are the versions of the modules that go with this release. @@ -14,21 +14,21 @@ 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.1 +scala.full.version=2.11.2 # external modules shipped with distribution, as specified by scala-library-all's pom scala-xml.version.number=1.0.2 -scala-parser-combinators.version.number=1.0.1 +scala-parser-combinators.version.number=1.0.2 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.3 +akka-actor.version.number=2.3.4 actors-migration.version.number=1.1.0 jline.version=2.12 # external modules, used internally (not shipped) partest.version.number=1.0.0 -scalacheck.version.number=1.11.3 +scalacheck.version.number=1.11.4 # TODO: modularize the compiler #scala-compiler-doc.version.number=1.0.0-RC1 |