You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by cu...@apache.org on 2018/09/28 17:40:28 UTC

[arrow] branch master updated: ARROW-3175: [Java] Switch to official flatbuffers Java artifact and com.github.icexelloss for flatc executable artifact

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

cutlerb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new e217802  ARROW-3175: [Java] Switch to official flatbuffers Java artifact and com.github.icexelloss for flatc executable artifact
e217802 is described below

commit e217802b9e337922a0b2a5763cfdf6ea4b888a21
Author: Li Jin <ic...@gmail.com>
AuthorDate: Fri Sep 28 10:40:11 2018 -0700

    ARROW-3175: [Java] Switch to official flatbuffers Java artifact and com.github.icexelloss for flatc executable artifact
    
    The existing flatbuffer we use from com.vlkan is quite old and since flatbuffer now publishes official maven artifact, we should those.
    
    One caveats is that the flatc we use is not available in the official release, so we are using one provided by com.github.icexelloss.
    
    Author: Li Jin <ic...@gmail.com>
    
    Closes #2515 from icexelloss/flatbuffer-maven and squashes the following commits:
    
    786de64 <Li Jin> Add dep prefix to fbs an flatc version property
    2f860d0 <Li Jin> Update dependency for flight
    772f310 <Li Jin> Use com.github.icexelllos for flatc artifact
    a47c633 <Li Jin> Move to official flatbuffers Java artifact
---
 java/flight/pom.xml |  4 ++--
 java/format/pom.xml | 12 ++++++------
 java/pom.xml        |  9 +++++----
 java/vector/pom.xml |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/java/flight/pom.xml b/java/flight/pom.xml
index 642fd12..7d4803e 100644
--- a/java/flight/pom.xml
+++ b/java/flight/pom.xml
@@ -28,8 +28,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.vlkan</groupId>
-      <artifactId>flatbuffers</artifactId>
+      <groupId>com.google.flatbuffers</groupId>
+      <artifactId>flatbuffers-java</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.arrow</groupId>
diff --git a/java/format/pom.xml b/java/format/pom.xml
index 844d868..e8d00af 100644
--- a/java/format/pom.xml
+++ b/java/format/pom.xml
@@ -24,15 +24,15 @@
 
   <properties>
     <flatc.download.skip>false</flatc.download.skip>
-    <flatc.executable>${project.build.directory}/flatc-${os.detected.classifier}-${fbs.version}.exe</flatc.executable>
+    <flatc.executable>${project.build.directory}/flatc-${os.detected.classifier}-${dep.flatc.version}.exe</flatc.executable>
     <flatc.generated.files>${project.build.directory}/generated-sources/flatc</flatc.generated.files>
     <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>com.vlkan</groupId>
-      <artifactId>flatbuffers</artifactId>
+      <groupId>com.google.flatbuffers</groupId>
+      <artifactId>flatbuffers-java</artifactId>
     </dependency>
   </dependencies>
 
@@ -60,9 +60,9 @@
           <configuration>
             <artifactItems>
               <artifactItem>
-                <groupId>com.vlkan</groupId>
+                <groupId>com.github.icexelloss</groupId>
                 <artifactId>flatc-${os.detected.classifier}</artifactId>
-                <version>${fbs.version}</version>
+                <version>${dep.flatc.version}</version>
                 <type>exe</type>
                 <overWrite>true</overWrite>
                 <outputDirectory>${project.build.directory}</outputDirectory>
@@ -88,7 +88,7 @@
             <executable>chmod</executable>
             <arguments>
               <argument>+x</argument>
-              <argument>${project.build.directory}/flatc-${os.detected.classifier}-${fbs.version}.exe</argument>
+              <argument>${project.build.directory}/flatc-${os.detected.classifier}-${dep.flatc.version}.exe</argument>
             </arguments>
             <skip>${flatc.download.skip}</skip>
           </configuration>
diff --git a/java/pom.xml b/java/pom.xml
index 09c3cdc..9a04e2a 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -35,7 +35,8 @@
     <dep.netty.version>4.1.22.Final</dep.netty.version>
     <dep.jackson.version>2.7.9</dep.jackson.version>
     <dep.hadoop.version>2.7.1</dep.hadoop.version>
-    <fbs.version>1.2.0-3f79e055</fbs.version>
+    <dep.fbs.version>1.9.0</dep.fbs.version>
+    <dep.flatc.version>1.9.0</dep.flatc.version>
     <forkCount>2</forkCount>
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
   </properties>
@@ -480,9 +481,9 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.vlkan</groupId>
-        <artifactId>flatbuffers</artifactId>
-        <version>${fbs.version}</version>
+        <groupId>com.google.flatbuffers</groupId>
+        <artifactId>flatbuffers-java</artifactId>
+        <version>${dep.fbs.version}</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index b4c15c2..89b62f6 100644
--- a/java/vector/pom.xml
+++ b/java/vector/pom.xml
@@ -67,8 +67,8 @@
       <artifactId>netty-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.vlkan</groupId>
-      <artifactId>flatbuffers</artifactId>
+      <groupId>com.google.flatbuffers</groupId>
+      <artifactId>flatbuffers-java</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>