diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-20 16:21:15 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-20 16:21:17 -0800 |
| commit | 4a4454b8f95a8d279b397d75d729e442e0266267 (patch) | |
| tree | 548a49c34d97fae380556591d061062eb6779d39 /src/build | |
| parent | c1c368bb2c910f24e78ff810741f3e32b6f991cb (diff) | |
| download | scala-4a4454b8f95a8d279b397d75d729e442e0266267.tar.gz scala-4a4454b8f95a8d279b397d75d729e442e0266267.tar.bz2 scala-4a4454b8f95a8d279b397d75d729e442e0266267.zip | |
Explicit jline dependency.
Duplicated from scala-compiler's pom (where it's optional),
so that resolving scala-dist's transitive dependencies include jline.
We won't see scala-compiler's optional dependency on jline when depending on
scala-compiler.
TODO: remove duplication once we have the scala-compiler-repl module
Diffstat (limited to 'src/build')
| -rw-r--r-- | src/build/maven/scala-compiler-pom.xml | 2 | ||||
| -rw-r--r-- | src/build/maven/scala-dist-pom.xml | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml index a16fe22343..4a000b27a1 100644 --- a/src/build/maven/scala-compiler-pom.xml +++ b/src/build/maven/scala-compiler-pom.xml @@ -50,7 +50,7 @@ <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId> <version>@PARSER_COMBINATORS_VERSION@</version> </dependency> - <dependency> <!-- for scala-compiler-repl--> + <dependency> <!-- for scala-compiler-repl; once it moves there, make it required --> <groupId>jline</groupId> <artifactId>jline</artifactId> <version>@JLINE_VERSION@</version> diff --git a/src/build/maven/scala-dist-pom.xml b/src/build/maven/scala-dist-pom.xml index c9c63ac647..413da928bb 100644 --- a/src/build/maven/scala-dist-pom.xml +++ b/src/build/maven/scala-dist-pom.xml @@ -39,6 +39,17 @@ <artifactId>scala-compiler</artifactId> <version>@VERSION@</version> </dependency> + <!-- duplicated from scala-compiler, where it's optional, + so that resolving scala-dist's transitive dependencies does not include jline, + even though we need to include it in the dist, but macros depending on the compiler + shouldn't have to require jline... + another reason to modularize and move the dependency to scala-compiler-repl + TODO: remove duplication once we have the scala-compiler-repl module --> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>@JLINE_VERSION@</version> + </dependency> </dependencies> <distributionManagement> <repository> |