Skip to content

PARQUET-540: Fix Cascading 3 build thrift and SLF4J. #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rdblue wants to merge 2 commits into from
Closed

PARQUET-540: Fix Cascading 3 build thrift and SLF4J. #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c976e04
PARQUET-540: Fix Cascading 3 build thrift and SLF4J.
rdblue Feb 19, 2016
b8e509b
PARQUET-540: Add a constant for maven-thrift-plugin version.
rdblue Jul 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion parquet-cascading/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
33 changes: 25 additions & 8 deletions parquet-cascading3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,33 @@
<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>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
<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>
Expand All @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion parquet-scrooge/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion parquet-thrift/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 1 addition & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,14 @@
</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>
<maven.compiler.target>${targetJavaVersion}</maven.compiler.target>
<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>
Expand Down