From 05eaebc4ec6fb6356ecbec54785c8e205227d3b4 Mon Sep 17 00:00:00 2001
From: Nandor Kollar <nkollar@cloudera.com>
Date: Mon, 30 Jul 2018 17:13:37 +0200
Subject: [PATCH 1/3] PARQUET-1280: [parquet-protobuf] Use maven protoc plugin

---
 parquet-protobuf/pom.xml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml
index b6f4627b16..522d605486 100644
--- a/parquet-protobuf/pom.xml
+++ b/parquet-protobuf/pom.xml
@@ -32,8 +32,8 @@
   <properties>
     <elephant-bird.version>4.4</elephant-bird.version>
     <protobuf.version>3.5.1</protobuf.version>
+    <protoc.version>3.5.1</protoc.version>
     <!-- allow using protoc from an alternative path -->
-    <protoc.path>protoc</protoc.path>
   </properties>
 
 
@@ -148,28 +148,24 @@
       </plugin>
 
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <groupId>com.github.os72</groupId>
+        <artifactId>protoc-jar-maven-plugin</artifactId>
+        <version>3.6.0.1</version>
         <executions>
           <execution>
             <id>generate-sources</id>
             <phase>generate-test-sources</phase>
-            <configuration>
-              <tasks>
-                <mkdir dir="${project.build.directory}/generated-test-sources" />
-                <mkdir dir="${project.build.directory}/generated-test-sources/java" />
-                <exec failonerror="true" executable="${protoc.path}">
-                  <arg value="--java_out=${project.build.directory}/generated-test-sources/java" />
-                  <arg value="src/test/resources/TestProtobuf.proto" />
-                  <arg value="src/test/resources/TestProto3.proto" />
-                  <arg value="-I." />
-                </exec>
-              </tasks>
-              <sourceRoot>src/main/java</sourceRoot>
-              <sourceRoot>target/generated-sources/java</sourceRoot>
-            </configuration>
             <goals>
               <goal>run</goal>
             </goals>
+            <configuration>
+              <protocVersion>${protoc.version}</protocVersion>
+              <addProtoSources>all</addProtoSources>
+              <outputDirectory>${project.build.directory}/generated-test-sources/java</outputDirectory>
+              <inputDirectories>
+                <include>src/test/resources</include>
+              </inputDirectories>
+            </configuration>
           </execution>
         </executions>
       </plugin>

From 6065ce235a13f95ad5828a57410be99f10ebe12f Mon Sep 17 00:00:00 2001
From: Nandor Kollar <nkollar@cloudera.com>
Date: Fri, 11 Jan 2019 17:21:00 +0100
Subject: [PATCH 2/3] Use protobuf.version instead of protoc.version

---
 parquet-protobuf/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml
index 522d605486..e70020a063 100644
--- a/parquet-protobuf/pom.xml
+++ b/parquet-protobuf/pom.xml
@@ -32,7 +32,6 @@
   <properties>
     <elephant-bird.version>4.4</elephant-bird.version>
     <protobuf.version>3.5.1</protobuf.version>
-    <protoc.version>3.5.1</protoc.version>
     <!-- allow using protoc from an alternative path -->
   </properties>
 
@@ -159,7 +158,7 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <protocVersion>${protoc.version}</protocVersion>
+              <protocVersion>${protobuf.version}</protocVersion>
               <addProtoSources>all</addProtoSources>
               <outputDirectory>${project.build.directory}/generated-test-sources/java</outputDirectory>
               <inputDirectories>

From acbc8485ef5402a96f45f43af72d07d8e8f8bdd5 Mon Sep 17 00:00:00 2001
From: Gabor Szadovszky <gabor@apache.org>
Date: Fri, 11 Jan 2019 18:17:56 +0100
Subject: [PATCH 3/3] Remove comment of the removed property protoc.path

---
 parquet-protobuf/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml
index e70020a063..125ef3df6c 100644
--- a/parquet-protobuf/pom.xml
+++ b/parquet-protobuf/pom.xml
@@ -32,7 +32,6 @@
   <properties>
     <elephant-bird.version>4.4</elephant-bird.version>
     <protobuf.version>3.5.1</protobuf.version>
-    <!-- allow using protoc from an alternative path -->
   </properties>