Skip to content
Browse files

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
  • Loading branch information...
1 parent c1c368b commit 4a4454b8f95a8d279b397d75d729e442e0266267 @adriaanm adriaanm committed
Showing with 12 additions and 1 deletion.
  1. +1 −1 src/build/maven/scala-compiler-pom.xml
  2. +11 −0 src/build/maven/scala-dist-pom.xml
View
2 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>
View
11 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>

0 comments on commit 4a4454b

Please sign in to comment.
Something went wrong with that request. Please try again.