You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2021/06/12 23:34:11 UTC

[orc] branch main updated: ORC-814: Build and test Java module on Apple Silicon (#717)

This is an automated email from the ASF dual-hosted git repository.

dongjoon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/orc.git


The following commit(s) were added to refs/heads/main by this push:
     new e0dd565  ORC-814: Build and test Java module on Apple Silicon (#717)
e0dd565 is described below

commit e0dd565691192139f559f6e621b0acfb1ced7c5f
Author: William Hyun <wi...@apache.org>
AuthorDate: Sat Jun 12 16:34:05 2021 -0700

    ORC-814: Build and test Java module on Apple Silicon (#717)
    
    ### What changes were proposed in this pull request?
    This PR aims to build and test Java module on Apple Silicon.
    
    ### Why are the changes needed?
    Currently, the protocol buffer download fails on Apple Silicon.
    
    ### How was this patch tested?
    Manual
    ```
    mvn package -Papplesilicon
    ```
---
 java/pom.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index b48c318..8edb67d 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -75,6 +75,7 @@
     <zookeeper.version>3.6.2</zookeeper.version>
     <maven.version>3.6.3</maven.version>
     <slf4j.version>1.7.30</slf4j.version>
+    <protoc.artifact>com.google.protobuf:protoc:2.5.0</protoc.artifact>
   </properties>
 
   <build>
@@ -321,7 +322,7 @@
                 <goal>run</goal>
               </goals>
               <configuration>
-                 <protocArtifact>com.google.protobuf:protoc:2.5.0</protocArtifact>
+                 <protocArtifact>${protoc.artifact}</protocArtifact>
                  <protocVersion>2.5.0</protocVersion>
                 <addSources>none</addSources>
                 <includeDirectories>
@@ -421,6 +422,12 @@
         <module>bench</module>
       </modules>
     </profile>
+    <profile>
+      <id>applesilicon</id>
+      <properties>
+        <protoc.artifact>com.google.protobuf:protoc:2.5.0:exe:osx-x86_64</protoc.artifact>
+      </properties>
+    </profile>
   </profiles>
 
   <dependencyManagement>