From commits-return-1510-archive-asf-public=cust-asf.ponee.io@parquet.apache.org  Mon Jan 14 10:58:33 2019
Return-Path: <commits-return-1510-archive-asf-public=cust-asf.ponee.io@parquet.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id 2DC8D180608
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 14 Jan 2019 10:58:33 +0100 (CET)
Received: (qmail 63302 invoked by uid 500); 14 Jan 2019 09:58:32 -0000
Mailing-List: contact commits-help@parquet.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@parquet.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@parquet.apache.org>
List-Post: <mailto:commits@parquet.apache.org>
List-Id: <commits.parquet.apache.org>
Reply-To: dev@parquet.apache.org
Delivered-To: mailing list commits@parquet.apache.org
Received: (qmail 63293 invoked by uid 99); 14 Jan 2019 09:58:32 -0000
Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jan 2019 09:58:32 +0000
From: GitBox <git@apache.org>
To: commits@parquet.apache.org
Subject: [parquet-mr] Diff for: [GitHub] gszadovszky closed pull request #506:
 PARQUET-1280: [parquet-protobuf] Use maven protoc plugin
Message-ID: <154745991177.29261.16515214327368617770.gitbox@gitbox.apache.org>
Date: Mon, 14 Jan 2019 09:58:31 -0000
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml
index b6f4627b1..125ef3df6 100644
--- a/parquet-protobuf/pom.xml
+++ b/parquet-protobuf/pom.xml
@@ -32,8 +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 -->
-    <protoc.path>protoc</protoc.path>
   </properties>
 
 
@@ -148,28 +146,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>${protobuf.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>


With regards,
Apache Git Services