Skip to content

PARQUET-371: update thrift dependency to 0.9.3; do not shade slf4j #50

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
julienledem wants to merge 2 commits into from
Closed

PARQUET-371: update thrift dependency to 0.9.3; do not shade slf4j #50

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
e30ad8f
update thrift dependency; do not shade slf4j
julienledem Feb 22, 2017
f5db375
update travis
julienledem May 23, 2017
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
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq protobuf-compiler
- sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev
- wget -nv http://archive.apache.org/dist/thrift/0.7.0/thrift-0.7.0.tar.gz
- tar zxf thrift-0.7.0.tar.gz
- cd thrift-0.7.0
- wget -nv http://archive.apache.org/dist/thrift/0.9.3/thrift-0.9.3.tar.gz
- tar zxf thrift-0.9.3.tar.gz
- cd thrift-0.9.3
- chmod +x ./configure
- ./configure --disable-gen-erl --disable-gen-hs --without-ruby --without-haskell --without-erlang
- sudo make install
Expand Down
19 changes: 3 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,9 @@
<artifactSet>
<includes>
<include>org.apache.thrift:libthrift</include>
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-nop</include>
</includes>
</artifactSet>
<filters>
<filter>
<!-- Exclude SLF4J's meta files, covered by LICENSE and NOTICE -->
<artifact>org.slf4j:*</artifact>
<excludes>
<exclude>META-INF/**/*</exclude>
</excludes>
</filter>
<filter>
<!-- Sigh. The Thrift jar contains its source -->
<artifact>org.apache.thrift:libthrift</artifact>
Expand All @@ -170,10 +161,6 @@
<pattern>org.apache.thrift</pattern>
<shadedPattern>${shade.prefix}.org.apache.thrift</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
<shadedPattern>${shade.prefix}.org.slf4j</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
Expand Down Expand Up @@ -209,8 +196,8 @@
<exclude>*/jdiff/*.xml</exclude>
<exclude>.travis.yml</exclude>
<exclude>licenses/**</exclude>
<exclude>thrift-0.7.0/**</exclude>
<exclude>thrift-0.7.0.tar.gz</exclude>
<exclude>thrift-0.9.3/**</exclude>
<exclude>thrift-0.9.3.tar.gz</exclude>
</excludes>
</configuration>
</plugin>
Expand All @@ -231,7 +218,7 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>0.7.0</version>
<version>0.9.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down