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/maven-deploy.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/maven-deploy.xml')
| -rw-r--r-- | src/build/maven/maven-deploy.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml index f52a7888ce..946b712b6c 100644 --- a/src/build/maven/maven-deploy.xml +++ b/src/build/maven/maven-deploy.xml @@ -55,6 +55,9 @@ <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true"> <filterset> <filter token="VERSION" value="@{version}" /> + <filter token="SCALA_BINARY_VERSION" value="${scala.binary.version}" /> + <filter token="XML_VERSION" value="${scala-xml.version.number}" /> + <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" /> <filter token="RELEASE_REPOSITORY" value="${remote.release.repository}" /> <filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" /> <filter token="JLINE_VERSION" value="${jline.version}" /> @@ -108,8 +111,6 @@ <deploy-one name="scala-actors" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> <deploy-one name="scala-compiler" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> <deploy-one name="scala-library" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> - <deploy-one name="scala-xml" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> - <deploy-one name="scala-parser-combinators" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> <deploy-one name="scala-reflect" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> <deploy-one name="scala-swing" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> <deploy-one name="scalap" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> |