diff options
| author | gjoranv <gv@oath.com> | 2018-01-12 16:21:27 +0100 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2018-01-16 12:25:38 +0100 |
| commit | 7f4406ad321547b3410b514de8cfb9c410ec5d45 (patch) | |
| tree | bd4d647d1898d547aa115debcf3ff36673c95471 /container-dependency-versions | |
| parent | 5c06d93019fb638f516fd26a1f103894261b8ceb (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 'container-dependency-versions')
| -rw-r--r-- | container-dependency-versions/pom.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 4d639ceedab..eca7002b977 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -336,6 +336,13 @@ <version>${mimepull.version}</version> </dependency> <dependency> + <!-- NOT provided from Jdisc runtime, but any project that has unit tests based on + the 'application' framework MUST use our version. --> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>${scala.version}</version> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> <version>${slf4j.version}</version> @@ -422,6 +429,7 @@ <guava.version>18.0</guava.version> <guice.version>3.0</guice.version> <jetty.version>9.4.8.v20171121</jetty.version> + <scala.version>2.11.4</scala.version> <!-- When updating this, the scala.major-version in parent must also be updated! --> <slf4j.version>1.7.5</slf4j.version> <!-- These must be kept in sync with version used by current jersey2.version. --> |