diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-16 01:05:31 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-16 12:08:42 -0400 |
| commit | 1d8037bbf56b303d69cd3e8faafc05fc5fc5db3e (patch) | |
| tree | 29f06951c7ee8c161906a50ec0cfcab61ef09ea0 /src | |
| parent | 479aee3617e952d8705b95ef2ea3a155914dd03c (diff) | |
| download | scala-1d8037bbf56b303d69cd3e8faafc05fc5fc5db3e.tar.gz scala-1d8037bbf56b303d69cd3e8faafc05fc5fc5db3e.tar.bz2 scala-1d8037bbf56b303d69cd3e8faafc05fc5fc5db3e.zip | |
Finished migrating to new versioning scheme
Conflicts:
build.xml
tools/get-scala-revision.bat
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/util/Properties.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 3ba803712d..38ca89b98b 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -101,8 +101,7 @@ private[scala] trait PropertiesTrait { /** The version number of the jar this was loaded from plus "version " prefix, * or "version (unknown)" if it cannot be determined. */ - val versionString = "version " + scalaPropOrElse("version.number", "(unknown)") + - scalaPropOrNone("maven.version.number").map(v => "(" + v + ")").getOrElse("") + val versionString = "version " + scalaPropOrElse("version.number", "(unknown)") val copyrightString = scalaPropOrElse("copyright.string", "(c) 2002-2011 LAMP/EPFL") /** This is the encoding to use reading in source files, overridden with -encoding |