summaryrefslogtreecommitdiff
path: root/src/build/pack.xml
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-06-24 15:21:08 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-07-05 16:00:29 -0700
commit1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662 (patch)
tree14755f21d0b6eeac18c3fe3c29ef361a391204ab /src/build/pack.xml
parent46a4635d3acc0a18869131879e6cde862d6b9776 (diff)
downloadscala-1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662.tar.gz
scala-1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662.tar.bz2
scala-1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662.zip
Unfork jline: use vanilla jline 2.11 as a dependency.
Notes: - no longer specifying terminal by class name in scripts (using 'unix') - jline doesn't need a separate jansi dependency; it includes its own version according to: http://mvnrepository.com/artifact/jline/jline/2.11
Diffstat (limited to 'src/build/pack.xml')
-rw-r--r--src/build/pack.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/build/pack.xml b/src/build/pack.xml
index aac121f828..6b6579ce12 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -151,7 +151,6 @@ MAIN DISTRIBUTION PACKAGING
</copy>
</sequential>
</macrodef>
- <mvn-copy-lib mvn.artifact.name="jline"/>
<mvn-copy-lib mvn.artifact.name="scala-library"/>
<mvn-copy-lib mvn.artifact.name="scala-xml"/>
<mvn-copy-lib mvn.artifact.name="scala-parser-combinators"/>
@@ -183,12 +182,6 @@ MAIN DISTRIBUTION PACKAGING
<target name="pack-maven.srcs" depends="pack-maven.libs">
<!-- Add missing src jars. -->
- <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/jline/jline-src.jar"
- basedir="${src.dir}/jline/src/main/java">
- <include name="**/*"/>
- </jar>
-
-
<!-- Continuations plugin -->
<jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-src.jar"
basedir="${src.dir}/continuations/plugin">
@@ -197,10 +190,6 @@ MAIN DISTRIBUTION PACKAGING
</target>
<target name="pack-maven.docs" depends="pack-maven.libs, pack-maven.plugins">
- <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/jline/jline-docs.jar"
- basedir="${build-docs.dir}/jline">
- <include name="**/*"/>
- </jar>
<jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"
basedir="${build-docs.dir}/library">
<include name="**/*"/>