diff options
| -rwxr-xr-x | dev/change-scala-version.sh | 2 | ||||
| -rw-r--r-- | pom.xml | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/dev/change-scala-version.sh b/dev/change-scala-version.sh index 6437e879de..6c4077c584 100755 --- a/dev/change-scala-version.sh +++ b/dev/change-scala-version.sh @@ -19,7 +19,7 @@ set -e -VALID_VERSIONS=( 2.10 2.11 2.12.0-M4 ) +VALID_VERSIONS=( 2.10 2.11 2.12 ) usage() { echo "Usage: $(basename $0) [-h|--help] <version> @@ -678,7 +678,7 @@ <dependency> <groupId>org.json4s</groupId> <artifactId>json4s-jackson_${scala.binary.version}</artifactId> - <version>3.2.11</version> + <version>3.5.0</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> @@ -708,7 +708,7 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> - <version>2.2.6</version> + <version>3.0.1</version> <scope>test</scope> </dependency> <dependency> @@ -720,7 +720,7 @@ <dependency> <groupId>org.scalacheck</groupId> <artifactId>scalacheck_${scala.binary.version}</artifactId> - <version>1.12.5</version> <!-- 1.13.0 appears incompatible with scalatest 2.2.6 --> + <version>1.13.4</version> <!-- 1.13.0 appears incompatible with scalatest 2.2.6 --> <scope>test</scope> </dependency> <dependency> @@ -2670,11 +2670,11 @@ </activation> <properties> <scala.version>2.12.0</scala.version> - <scala.binary.version>2.12.0</scala.binary.version> + <scala.binary.version>2.12</scala.binary.version> <!-- This corresponds to https://github.com/twitter/chill/pull/253 --> - <chill.version>0.8.1-SNAPSHOT</chill.version> + <chill.version>0.8.2-SNAPSHOT</chill.version> <!-- This incorporates https://github.com/FasterXML/jackson-module-scala/pull/247 --> - <fasterxml.jackson.version>2.7.3-SNAPSHOT</fasterxml.jackson.version> + <fasterxml.jackson.version>2.8.4</fasterxml.jackson.version> </properties> <dependencyManagement> <dependencies> |