From 1d8037bbf56b303d69cd3e8faafc05fc5fc5db3e Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Fri, 16 Mar 2012 01:05:31 -0400 Subject: Finished migrating to new versioning scheme Conflicts: build.xml tools/get-scala-revision.bat --- src/library/scala/util/Properties.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/library') 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 -- cgit v1.2.3