summaryrefslogtreecommitdiff
path: root/src/build
diff options
context:
space:
mode:
authorTobias Roeser <le.petit.fou@web.de>2014-05-09 16:14:39 +0200
committerTobias Roeser <le.petit.fou@web.de>2014-05-09 16:14:39 +0200
commit4483085b9b66d7460468fd80c62b42c0b88a5e76 (patch)
tree611b1000774637562737371baa8ce1c10d7fb27d /src/build
parentf4db4afab756febb2f71b27ccc3e6ce084683e96 (diff)
downloadscala-4483085b9b66d7460468fd80c62b42c0b88a5e76.tar.gz
scala-4483085b9b66d7460468fd80c62b42c0b88a5e76.tar.bz2
scala-4483085b9b66d7460468fd80c62b42c0b88a5e76.zip
Re-added the scala.util.parsing package import, with optional resolution.
Diffstat (limited to 'src/build')
-rw-r--r--src/build/bnd/scala-compiler.bnd2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/build/bnd/scala-compiler.bnd b/src/build/bnd/scala-compiler.bnd
index 745ffc1176..2bd24d780d 100644
--- a/src/build/bnd/scala-compiler.bnd
+++ b/src/build/bnd/scala-compiler.bnd
@@ -5,7 +5,7 @@ Bundle-Version: ${ver}
Export-Package: *;version=${ver}
Import-Package: jline.*;resolution:=optional, \
org.apache.tools.ant.*;resolution:=optional, \
- !scala.util.parsing.*, \
+ scala.util.parsing.*;version="${range;[====,====];@PARSER_COMBINATORS_VERSION@}";resolution:=optional, \
scala.xml.*;version="${range;[====,====];@XML_VERSION@}";resolution:=optional, \
scala.*;version="${range;[==,=+);${ver}}", \
*