parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject parquet-mr git commit: PARQUET-380: Fix build when using thrift 0.9.0.
Date Tue, 17 Nov 2015 23:56:18 GMT
Repository: parquet-mr
Updated Branches:
  refs/heads/master 440882c65 -> 09129877d


PARQUET-380: Fix build when using thrift 0.9.0.

This adds the correct version of libthrift as a dependency for
parquet-cascading and parquet-scrooge, which overrides the 0.7.0
dependency that elephantbird uses.

Author: Ryan Blue <blue@apache.org>

Closes #276 from rdblue/PARQUET-380-fix-thrift-0.9.0 and squashes the following commits:

cbf0d84 [Ryan Blue] PARQUET-380: Fix build when using thrift 0.9.0.


Project: http://git-wip-us.apache.org/repos/asf/parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-mr/commit/09129877
Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/09129877
Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/09129877

Branch: refs/heads/master
Commit: 09129877daf6f3b4b9cdb32432084dcbeb2fdde0
Parents: 440882c
Author: Ryan Blue <blue@apache.org>
Authored: Tue Nov 17 15:56:09 2015 -0800
Committer: Ryan Blue <blue@apache.org>
Committed: Tue Nov 17 15:56:09 2015 -0800

----------------------------------------------------------------------
 parquet-cascading/pom.xml | 32 +++++++++++++++++++++++++-------
 parquet-scrooge/pom.xml   | 18 ++++++++++++++++++
 pom.xml                   |  1 +
 3 files changed, 44 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/09129877/parquet-cascading/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-cascading/pom.xml b/parquet-cascading/pom.xml
index 6715277..81b955c 100644
--- a/parquet-cascading/pom.xml
+++ b/parquet-cascading/pom.xml
@@ -51,9 +51,15 @@
       <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.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>${thrift.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -81,10 +87,22 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-       <groupId>cascading</groupId>
-       <artifactId>cascading-hadoop</artifactId>
-       <version>${cascading.version}</version>
-       <scope>provided</scope>
+      <groupId>cascading</groupId>
+      <artifactId>cascading-hadoop</artifactId>
+      <version>${cascading.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/09129877/parquet-scrooge/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-scrooge/pom.xml b/parquet-scrooge/pom.xml
index ad68d2d..244302d 100644
--- a/parquet-scrooge/pom.xml
+++ b/parquet-scrooge/pom.xml
@@ -85,6 +85,12 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>${thrift.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-cascading</artifactId>
       <version>${project.version}</version>
@@ -112,6 +118,18 @@
       <version>${cascading.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/09129877/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 14feb9c..c9d7b94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,7 @@
     <thrift.version>0.7.0</thrift.version>
     <fastutil.version>6.5.7</fastutil.version>
     <semver.api.version>0.9.33</semver.api.version>
+    <slf4j.version>1.7.5</slf4j.version>
   </properties>
 
   <modules>


Mime
View raw message