diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-11 14:47:30 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-11 17:47:09 +0200 |
| commit | 680acc25df067e19f4b8933b8f68e9bff4596d76 (patch) | |
| tree | eb4e466895336ed456746aebfd649aaa14a983e8 | |
| parent | 08f88b2c6449a55f060d604e17ebdfddfbb84b41 (diff) | |
Upgrade to Scala 2.12.2
| -rw-r--r-- | pom.xml | 12 | ||||
| -rw-r--r-- | service-monitor/pom.xml | 2 |
2 files changed, 7 insertions, 7 deletions
@@ -953,22 +953,22 @@ <dependency> <groupId>org.scala-lang.modules</groupId> <artifactId>scala-parser-combinators_${scala.major-version}</artifactId> - <version>1.0.1</version> + <version>1.0.6</version> </dependency> <dependency> <groupId>org.scala-lang.modules</groupId> <artifactId>scala-xml_${scala.major-version}</artifactId> - <version>1.0.2</version> + <version>1.0.6</version> </dependency> <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.major-version}</artifactId> - <version>2.2.2</version> + <version>3.0.3</version> </dependency> <dependency> <groupId>org.json4s</groupId> <artifactId>json4s-native_${scala.major-version}</artifactId> - <version>3.3.0</version> + <version>3.5.2</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -1082,8 +1082,8 @@ <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.12</scala.major-version> + <scala.version>${scala.major-version}.2</scala.version> <surefire.version>2.19.1</surefire.version> <!-- NOTE bjorncs 15.06.2017: Version 2.20 has OoM issues --> </properties> diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index a23760c435b..f0678974ec2 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -27,7 +27,7 @@ <dependency> <groupId>io.reactivex</groupId> <artifactId>rxscala_${scala.major-version}</artifactId> - <version>0.23.1</version> + <version>0.26.5</version> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> |