diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-14 13:27:03 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-14 13:27:03 -0700 |
| commit | 275194a62989115e065ff69c41942f113db8b8f7 (patch) | |
| tree | 64722697ea2a22f1499cc92574da00fa888a16a8 /src | |
| parent | 8949ba3fa875166776d08c6600849d1eb531d832 (diff) | |
| parent | 8f5a892512ba848a52a4ddd5d79e9c79d12ccfc1 (diff) | |
| download | scala-275194a62989115e065ff69c41942f113db8b8f7.tar.gz scala-275194a62989115e065ff69c41942f113db8b8f7.tar.bz2 scala-275194a62989115e065ff69c41942f113db8b8f7.zip | |
Merge pull request #2791 from som-snytt/issue/7265-2.11
SI-7265 javaSpecVersion, adjust isJava... tests for 2.11
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/util/Properties.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 02c461f3c6..8b63a73638 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -131,10 +131,9 @@ private[scala] trait PropertiesTrait { def javaVmName = propOrEmpty("java.vm.name") def javaVmVendor = propOrEmpty("java.vm.vendor") def javaVmVersion = propOrEmpty("java.vm.version") - // this property must remain less-well-known until 2.11 - private def javaSpecVersion = propOrEmpty("java.specification.version") - //private def javaSpecVendor = propOrEmpty("java.specification.vendor") - //private def javaSpecName = propOrEmpty("java.specification.name") + def javaSpecVersion = propOrEmpty("java.specification.version") + def javaSpecVendor = propOrEmpty("java.specification.vendor") + def javaSpecName = propOrEmpty("java.specification.name") def osName = propOrEmpty("os.name") def scalaHome = propOrEmpty("scala.home") def tmpDir = propOrEmpty("java.io.tmpdir") |