diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-25 21:45:05 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-25 21:48:26 +1000 |
| commit | 964630ec1f4cf94f4d09eff394f959e733e3fcf7 (patch) | |
| tree | edbe21ff3fd89156701c8ecedf5d900915bfb759 /project | |
| parent | d375334c26c625da345c5e77bca2975f21b8bd10 (diff) | |
| parent | e0fc92a2b7b27141b41cecafd3ec7804ad02707b (diff) | |
| download | scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.tar.gz scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.tar.bz2 scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20160225
Conflicts:
scripts/jobs/integrate/bootstrap
src/build/maven/scala-actors-pom.xml
test/files/pos/t3420.flags
Conflicts were trivial to resolve.
Diffstat (limited to 'project')
| -rw-r--r-- | project/VersionUtil.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala index fab22e66d4..6c8aebf74f 100644 --- a/project/VersionUtil.scala +++ b/project/VersionUtil.scala @@ -115,7 +115,9 @@ object VersionUtil { val in = new FileInputStream(file("versions.properties")) try props.load(in) finally in.close() - props.asScala.toMap + props.asScala.toMap.map { + case (k, v) => (k, sys.props.getOrElse(k, v)) // allow system properties to override versions.properties + } } /** Get a subproject version number from `versionProps` */ |