summaryrefslogtreecommitdiffstats
path: root/parent
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-01-12 16:21:27 +0100
committergjoranv <gv@oath.com>2018-01-16 12:25:38 +0100
commit7f4406ad321547b3410b514de8cfb9c410ec5d45 (patch)
treebd4d647d1898d547aa115debcf3ff36673c95471 /parent
parent5c06d93019fb638f516fd26a1f103894261b8ceb (diff)
Add dependency management for scala-library.
- All users with 'application' based unit tests must use the version of scala-library that vespa is built with.
Diffstat (limited to 'parent')
-rw-r--r--parent/pom.xml8
1 files changed, 1 insertions, 7 deletions
diff --git a/parent/pom.xml b/parent/pom.xml
index 0a19d66d674..916b6b450c2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -617,11 +617,6 @@
<version>4.3.0</version>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-parser-combinators_${scala.major-version}</artifactId>
<version>1.0.1</version>
@@ -710,8 +705,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<test.hide>true</test.hide>
<doclint>all</doclint>
- <scala.major-version>2.11</scala.major-version>
- <scala.version>${scala.major-version}.4</scala.version>
+ <scala.major-version>2.11</scala.major-version> <!-- TODO: factorylib magic for maven cache bootstrapping prevents moving this to container-dep-versions. -->
<surefire.version>2.19.1</surefire.version> <!-- NOTE bjorncs 15.06.2017: Version 2.20 has OoM issues -->
</properties>