From 00b34b248e662ccf8168bad27602d77ff11e19e3 Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.blake.williams@gmail.com>
Date: Fri, 28 Dec 2018 02:04:30 +0000
Subject: [PATCH] bump to scala 2.12

---
 parquet-scala/pom.xml | 2 +-
 pom.xml               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/parquet-scala/pom.xml b/parquet-scala/pom.xml
index 22ea3c0de6..58d586a9a0 100644
--- a/parquet-scala/pom.xml
+++ b/parquet-scala/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_${scala.binary.version}</artifactId>
-      <version>2.2.1</version>
+      <version>3.0.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 36696176ad..1ae299b24a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,9 +83,9 @@
     <parquet.format.version>2.3.1</parquet.format.version>
     <previous.version>1.7.0</previous.version>
     <thrift.executable>thrift</thrift.executable>
-    <scala.version>2.10.4</scala.version>
+    <scala.version>2.12.8</scala.version>
     <!-- scala.binary.version is used for projects that fetch dependencies that are in scala -->
-    <scala.binary.version>2.10</scala.binary.version>
+    <scala.binary.version>2.12</scala.binary.version>
     <scala.maven.test.skip>false</scala.maven.test.skip>
     <pig.version>0.13.0</pig.version>
     <pig.classifier>h2</pig.classifier>