From c976e043fc535a8794d4101e99e3b399a5a7656e Mon Sep 17 00:00:00 2001
From: Ryan Blue <blue@apache.org>
Date: Fri, 19 Feb 2016 13:36:08 -0800
Subject: [PATCH 1/2] PARQUET-540: Fix Cascading 3 build thrift and SLF4J.

This also updates the build to use the public maven-thrift-plugin, which
is version 0.1.11.
---
 parquet-cascading/pom.xml  |  2 +-
 parquet-cascading3/pom.xml | 33 +++++++++++++++++++++++++--------
 parquet-scrooge/pom.xml    |  2 +-
 parquet-thrift/pom.xml     |  2 +-
 pom.xml                    |  9 ---------
 5 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/parquet-cascading/pom.xml b/parquet-cascading/pom.xml
index cabb0038f7..46011b8420 100644
--- a/parquet-cascading/pom.xml
+++ b/parquet-cascading/pom.xml
@@ -157,7 +157,7 @@
       <plugin>
         <groupId>org.apache.thrift.tools</groupId>
         <artifactId>maven-thrift-plugin</artifactId>
-        <version>0.1.10</version>
+        <version>0.1.11</version>
         <configuration>
           <thriftExecutable>${thrift.executable}</thriftExecutable>
           <thriftSourceRoot>../parquet-cascading-common23/src/main/thrift</thriftSourceRoot>
diff --git a/parquet-cascading3/pom.xml b/parquet-cascading3/pom.xml
index ea552ad004..f6f9eef880 100644
--- a/parquet-cascading3/pom.xml
+++ b/parquet-cascading3/pom.xml
@@ -51,9 +51,14 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>org.apache.parquet</groupId>
-        <artifactId>parquet-thrift</artifactId>
-        <version>${project.version}</version>
+      <groupId>org.apache.parquet</groupId>
+      <artifactId>parquet-thrift</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -61,6 +66,18 @@
       <version>${hadoop.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>${thrift.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+       <groupId>cascading</groupId>
+       <artifactId>cascading-hadoop</artifactId> <!-- building against cascading-hadoop for Hadoop1, but will use against any backend -->
+       <version>${cascading3.version}</version>
+       <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-column</artifactId>
@@ -75,10 +92,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-       <groupId>cascading</groupId>
-       <artifactId>cascading-hadoop</artifactId> <!-- building against cascading-hadoop for Hadoop1, but will use against any backend -->
-       <version>${cascading3.version}</version>
-       <scope>provided</scope>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
@@ -157,7 +174,7 @@
       <plugin>
         <groupId>org.apache.thrift.tools</groupId>
         <artifactId>maven-thrift-plugin</artifactId>
-        <version>0.1.10</version>
+        <version>0.1.11</version>
         <configuration>
           <thriftExecutable>${thrift.executable}</thriftExecutable>
           <thriftSourceRoot>../parquet-cascading-common23/src/main/thrift</thriftSourceRoot>
diff --git a/parquet-scrooge/pom.xml b/parquet-scrooge/pom.xml
index 7e587f1e7f..9cf63bb6a3 100644
--- a/parquet-scrooge/pom.xml
+++ b/parquet-scrooge/pom.xml
@@ -140,7 +140,7 @@
         <plugin>
             <groupId>org.apache.thrift.tools</groupId>
             <artifactId>maven-thrift-plugin</artifactId>
-            <version>0.1.10</version>
+            <version>0.1.11</version>
             <configuration>
                 <thriftExecutable>${thrift.executable}</thriftExecutable>
             </configuration>
diff --git a/parquet-thrift/pom.xml b/parquet-thrift/pom.xml
index 66594ca0ff..bbdf3b24ec 100644
--- a/parquet-thrift/pom.xml
+++ b/parquet-thrift/pom.xml
@@ -144,7 +144,7 @@
       <plugin>
         <groupId>org.apache.thrift.tools</groupId>
         <artifactId>maven-thrift-plugin</artifactId>
-        <version>0.1.10</version>
+        <version>0.1.11</version>
         <configuration>
           <thriftExecutable>${thrift.executable}</thriftExecutable>
         </configuration>
diff --git a/pom.xml b/pom.xml
index f606faaad4..f4d16a8b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,15 +57,6 @@
     </developer>
   </developers>
 
-  <!-- this is needed for maven-thrift-plugin, would like to remove this.
-   see: https://issues.apache.org/jira/browse/THRIFT-1536  -->
-  <pluginRepositories>
-    <pluginRepository>
-      <id>Twitter public Maven repo</id>
-      <url>http://maven.twttr.com</url>
-    </pluginRepository>
-  </pluginRepositories>
-
   <properties>
     <targetJavaVersion>1.6</targetJavaVersion>
     <maven.compiler.source>1.6</maven.compiler.source>

From b8e509bae9c35be218cbb686cca1db4986f86227 Mon Sep 17 00:00:00 2001
From: Ryan Blue <blue@apache.org>
Date: Thu, 7 Jul 2016 14:41:12 -0700
Subject: [PATCH 2/2] PARQUET-540: Add a constant for maven-thrift-plugin
 version.

---
 parquet-cascading/pom.xml  | 2 +-
 parquet-cascading3/pom.xml | 2 +-
 parquet-scrooge/pom.xml    | 2 +-
 parquet-thrift/pom.xml     | 2 +-
 pom.xml                    | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/parquet-cascading/pom.xml b/parquet-cascading/pom.xml
index 46011b8420..0e1e1e1d79 100644
--- a/parquet-cascading/pom.xml
+++ b/parquet-cascading/pom.xml
@@ -157,7 +157,7 @@
       <plugin>
         <groupId>org.apache.thrift.tools</groupId>
         <artifactId>maven-thrift-plugin</artifactId>
-        <version>0.1.11</version>
+        <version>${maven-thrift-plugin.version}</version>
         <configuration>
           <thriftExecutable>${thrift.executable}</thriftExecutable>
           <thriftSourceRoot>../parquet-cascading-common23/src/main/thrift</thriftSourceRoot>
diff --git a/parquet-cascading3/pom.xml b/parquet-cascading3/pom.xml
index f6f9eef880..67b5e0955f 100644
--- a/parquet-cascading3/pom.xml
+++ b/parquet-cascading3/pom.xml
@@ -174,7 +174,7 @@
       <plugin>
         <groupId>org.apache.thrift.tools</groupId>
         <artifactId>maven-thrift-plugin</artifactId>
-        <version>0.1.11</version>
+        <version>${maven-thrift-plugin.version}</version>
         <configuration>
           <thriftExecutable>${thrift.executable}</thriftExecutable>
           <thriftSourceRoot>../parquet-cascading-common23/src/main/thrift</thriftSourceRoot>
diff --git a/parquet-scrooge/pom.xml b/parquet-scrooge/pom.xml
index 9cf63bb6a3..2cc0693ae8 100644
--- a/parquet-scrooge/pom.xml
+++ b/parquet-scrooge/pom.xml
@@ -140,7 +140,7 @@
         <plugin>
             <groupId>org.apache.thrift.tools</groupId>
             <artifactId>maven-thrift-plugin</artifactId>
-            <version>0.1.11</version>
+            <version>${maven-thrift-plugin.version}</version>
             <configuration>
                 <thriftExecutable>${thrift.executable}</thriftExecutable>
             </configuration>
diff --git a/parquet-thrift/pom.xml b/parquet-thrift/pom.xml
index bbdf3b24ec..d2cee27f2d 100644
--- a/parquet-thrift/pom.xml
+++ b/parquet-thrift/pom.xml
@@ -144,7 +144,7 @@
       <plugin>
         <groupId>org.apache.thrift.tools</groupId>
         <artifactId>maven-thrift-plugin</artifactId>
-        <version>0.1.11</version>
+        <version>${maven-thrift-plugin.version}</version>
         <configuration>
           <thriftExecutable>${thrift.executable}</thriftExecutable>
         </configuration>
diff --git a/pom.xml b/pom.xml
index f4d16a8b2d..e9288dbf20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <github.global.server>github</github.global.server>
     <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
+    <maven-thrift-plugin.version>0.1.11</maven-thrift-plugin.version>
     <jackson.groupId>org.codehaus.jackson</jackson.groupId>
     <jackson.version>1.9.11</jackson.version>
     <jackson.package>org.codehaus.jackson</jackson.package>