You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by bl...@apache.org on 2016/07/15 16:56:37 UTC
parquet-mr git commit: PARQUET-540: Fix Cascading 3 build thrift and
SLF4J.
Repository: parquet-mr
Updated Branches:
refs/heads/master 42662f875 -> a421d952e
PARQUET-540: Fix Cascading 3 build thrift and SLF4J.
This fixes:
* parquet-cascading3 should have a libthrift dependency that uses thrift.version
* parquet-cascading3 should have the standard SLF4J dependencies
* Twitter's maven repo is no longer necessary because Parquet uses the Apache maven-thrift-plugin
Author: Ryan Blue <bl...@apache.org>
Closes #328 from rdblue/PARQUET-540-fix-cascading3-build and squashes the following commits:
b8e509b [Ryan Blue] PARQUET-540: Add a constant for maven-thrift-plugin version.
c976e04 [Ryan Blue] PARQUET-540: Fix Cascading 3 build thrift and SLF4J.
Project: http://git-wip-us.apache.org/repos/asf/parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-mr/commit/a421d952
Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/a421d952
Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/a421d952
Branch: refs/heads/master
Commit: a421d952efd85ec581131069a5b132934ee286d3
Parents: 42662f8
Author: Ryan Blue <bl...@apache.org>
Authored: Fri Jul 15 09:56:32 2016 -0700
Committer: Ryan Blue <bl...@apache.org>
Committed: Fri Jul 15 09:56:32 2016 -0700
----------------------------------------------------------------------
parquet-cascading/pom.xml | 2 +-
parquet-cascading3/pom.xml | 33 +++++++++++++++++++++++++--------
parquet-scrooge/pom.xml | 2 +-
parquet-thrift/pom.xml | 2 +-
pom.xml | 10 +---------
5 files changed, 29 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/a421d952/parquet-cascading/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-cascading/pom.xml b/parquet-cascading/pom.xml
index cabb003..0e1e1e1 100644
--- a/parquet-cascading/pom.xml
+++ b/parquet-cascading/pom.xml
@@ -157,7 +157,7 @@
<plugin>
<groupId>org.apache.thrift.tools</groupId>
<artifactId>maven-thrift-plugin</artifactId>
- <version>0.1.10</version>
+ <version>${maven-thrift-plugin.version}</version>
<configuration>
<thriftExecutable>${thrift.executable}</thriftExecutable>
<thriftSourceRoot>../parquet-cascading-common23/src/main/thrift</thriftSourceRoot>
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/a421d952/parquet-cascading3/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-cascading3/pom.xml b/parquet-cascading3/pom.xml
index ea552ad..67b5e09 100644
--- a/parquet-cascading3/pom.xml
+++ b/parquet-cascading3/pom.xml
@@ -51,9 +51,14 @@
<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.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -62,6 +67,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>${thrift.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>cascading</groupId>
+ <artifactId>cascading-hadoop</artifactId> <!-- building against cascading-hadoop for Hadoop1, but will use against any backend -->
+ <version>${cascading3.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-column</artifactId>
<version>${project.version}</version>
@@ -75,10 +92,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>cascading</groupId>
- <artifactId>cascading-hadoop</artifactId> <!-- building against cascading-hadoop for Hadoop1, but will use against any backend -->
- <version>${cascading3.version}</version>
- <scope>provided</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -157,7 +174,7 @@
<plugin>
<groupId>org.apache.thrift.tools</groupId>
<artifactId>maven-thrift-plugin</artifactId>
- <version>0.1.10</version>
+ <version>${maven-thrift-plugin.version}</version>
<configuration>
<thriftExecutable>${thrift.executable}</thriftExecutable>
<thriftSourceRoot>../parquet-cascading-common23/src/main/thrift</thriftSourceRoot>
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/a421d952/parquet-scrooge/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-scrooge/pom.xml b/parquet-scrooge/pom.xml
index 7e587f1..2cc0693 100644
--- a/parquet-scrooge/pom.xml
+++ b/parquet-scrooge/pom.xml
@@ -140,7 +140,7 @@
<plugin>
<groupId>org.apache.thrift.tools</groupId>
<artifactId>maven-thrift-plugin</artifactId>
- <version>0.1.10</version>
+ <version>${maven-thrift-plugin.version}</version>
<configuration>
<thriftExecutable>${thrift.executable}</thriftExecutable>
</configuration>
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/a421d952/parquet-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-thrift/pom.xml b/parquet-thrift/pom.xml
index 66594ca..d2cee27 100644
--- a/parquet-thrift/pom.xml
+++ b/parquet-thrift/pom.xml
@@ -144,7 +144,7 @@
<plugin>
<groupId>org.apache.thrift.tools</groupId>
<artifactId>maven-thrift-plugin</artifactId>
- <version>0.1.10</version>
+ <version>${maven-thrift-plugin.version}</version>
<configuration>
<thriftExecutable>${thrift.executable}</thriftExecutable>
</configuration>
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/a421d952/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 512bf37..510c329 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,15 +57,6 @@
</developer>
</developers>
- <!-- this is needed for maven-thrift-plugin, would like to remove this.
- see: https://issues.apache.org/jira/browse/THRIFT-1536 -->
- <pluginRepositories>
- <pluginRepository>
- <id>Twitter public Maven repo</id>
- <url>http://maven.twttr.com</url>
- </pluginRepository>
- </pluginRepositories>
-
<properties>
<targetJavaVersion>1.6</targetJavaVersion>
<maven.compiler.source>1.6</maven.compiler.source>
@@ -73,6 +64,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<github.global.server>github</github.global.server>
<maven-jar-plugin.version>2.4</maven-jar-plugin.version>
+ <maven-thrift-plugin.version>0.1.11</maven-thrift-plugin.version>
<jackson.groupId>org.codehaus.jackson</jackson.groupId>
<jackson.version>1.9.11</jackson.version>
<jackson.package>org.codehaus.jackson</jackson.package>