diff options
author | Olli Virtanen <ovirtanen@gmail.com> | 2018-06-26 14:41:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-26 14:41:06 +0200 |
commit | 2258dce0e6e5dab882f8a8485f9fc59867d1d7a9 (patch) | |
tree | 9846e3fa414c19bbe07292aac83e954ad478d6a1 /container-dependency-versions/pom.xml | |
parent | 66ecd87dd55b363db6d5ac1ed7697902f7ee6bc5 (diff) | |
parent | 0e5001395c46511a8b57b9721a0a8e341459e640 (diff) |
Merge pull request #6272 from vespa-engine/ovirtanen/remove-scala-from-poms
Remove Scala remnants from Maven build files
Diffstat (limited to 'container-dependency-versions/pom.xml')
-rw-r--r-- | container-dependency-versions/pom.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 5330fca5a67..195e66902db 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -371,13 +371,6 @@ <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> @@ -466,7 +459,6 @@ <guice.version>3.0</guice.version> <jaxb.version>2.3.0</jaxb.version> <jetty.version>9.4.10.v20180503</jetty.version> - <scala.version>2.11.12</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. --> |