diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-16 17:22:21 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-27 11:10:30 -0700 |
| commit | 67600a72d47900a22e97d82f236cca1b0153674e (patch) | |
| tree | 7148767332d1a25146d50c65eb4d6c295a974c8e /src/build/maven/scala-compiler-pom.xml | |
| parent | 9c50dd52743b7ff4de19548669dfa7e7a0304034 (diff) | |
| download | scala-67600a72d47900a22e97d82f236cca1b0153674e.tar.gz scala-67600a72d47900a22e97d82f236cca1b0153674e.tar.bz2 scala-67600a72d47900a22e97d82f236cca1b0153674e.zip | |
Remove scala-xml and scala-parser-combinators
These modules move to their own repositories:
- https://github.com/scala/scala-xml (v1.0-RC3)
- https://github.com/scala/scala-parser-combinators (v1.0-RC1)
The modularization depends on the new partest, as the old one's
classpath handling did not support a modularized scala.
The compiler pom now depends on the artifacts published separately,
with versions specified in versions.properties.
NOTES:
- The osgi tests resolve the xml and parsers jars and osgi-fy them,
as they are no longer built locally.
TODO: Can we move the osgification to the module builds?
- Disabled local repositories: don't want to accidentally include
unpublished artifacts in releases etc.
Diffstat (limited to 'src/build/maven/scala-compiler-pom.xml')
| -rw-r--r-- | src/build/maven/scala-compiler-pom.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml index 6e7f1a0f2c..8cc42c22ae 100644 --- a/src/build/maven/scala-compiler-pom.xml +++ b/src/build/maven/scala-compiler-pom.xml @@ -38,14 +38,14 @@ <version>@VERSION@</version> </dependency> <dependency> <!-- for scaladoc --> - <groupId>org.scala-lang</groupId> - <artifactId>scala-xml</artifactId> - <version>@VERSION@</version> + <groupId>org.scala-lang.modules</groupId> + <artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId> + <version>@XML_VERSION@</version> </dependency> <dependency> <!-- for scaladoc --> - <groupId>org.scala-lang</groupId> - <artifactId>scala-parser-combinators</artifactId> - <version>@VERSION@</version> + <groupId>org.scala-lang.modules</groupId> + <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId> + <version>@PARSER_COMBINATORS_VERSION@</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> |