From 93557386c9d9eee0e50a330dac6f41db79058b0a Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Sat, 26 Jan 2019 11:54:07 +0100
Subject: [PATCH] PARQUET-1496: Update Scala to 2.12

---
 parquet-scrooge/pom.xml | 8 ++++----
 pom.xml                 | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/parquet-scrooge/pom.xml b/parquet-scrooge/pom.xml
index e8a9b63eb3..ce6a2c61c4 100644
--- a/parquet-scrooge/pom.xml
+++ b/parquet-scrooge/pom.xml
@@ -38,7 +38,7 @@
       <url>http://conjars.org/repo</url>
     </repository>
   </repositories>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.parquet</groupId>
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>scrooge-core_${scala.binary.version}</artifactId>
-      <version>4.7.0</version>
+      <version>19.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.parquet</groupId>
@@ -164,7 +164,7 @@
         <plugin>
             <groupId>net.alchim31.maven</groupId>
             <artifactId>scala-maven-plugin</artifactId>
-            <version>3.1.6</version>
+            <version>3.4.4</version>
             <executions>
                 <execution>
                     <id>scala-compile-first</id>
@@ -203,7 +203,7 @@
         <plugin>
             <groupId>com.twitter</groupId>
             <artifactId>scrooge-maven-plugin</artifactId>
-            <version>3.17.0</version>
+            <version>19.1.0</version>
             <configuration>
                 <outputDirectory>${project.build.directory}/generated-test-sources/scrooge</outputDirectory>
                 <thriftNamespaceMappings>
diff --git a/pom.xml b/pom.xml
index d1ce7dd4e0..fad6d6dafe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,9 +85,9 @@
     <previous.version>1.7.0</previous.version>
     <thrift.executable>thrift</thrift.executable>
     <format.thrift.executable>thrift</format.thrift.executable>
-    <scala.version>2.10.6</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.16.0</pig.version>
     <pig.classifier>h2</pig.classifier>