parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject parquet-format git commit: PARQUET-371: update thrift dependency to 0.9.3; do not shade slf4j
Date Sat, 29 Jul 2017 23:30:26 GMT
Repository: parquet-format
Updated Branches:
  refs/heads/master b6931055c -> d2697120b


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

Author: Julien Le Dem <julien@dremio.com>
Author: Julien Le Dem <julien@apache.org>

Closes #50 from julienledem/update_thrift and squashes the following commits:

f5db375 [Julien Le Dem] update travis
e30ad8f [Julien Le Dem] update thrift dependency; do not shade slf4j


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

Branch: refs/heads/master
Commit: d2697120b9bb127538f56f72502c8b6a125fa39a
Parents: b693105
Author: Julien Le Dem <julien@dremio.com>
Authored: Sat Jul 29 16:30:22 2017 -0700
Committer: Ryan Blue <blue@apache.org>
Committed: Sat Jul 29 16:30:22 2017 -0700

----------------------------------------------------------------------
 .travis.yml |  6 +++---
 pom.xml     | 19 +++----------------
 2 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-format/blob/d2697120/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index a97cfb3..f60695a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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

http://git-wip-us.apache.org/repos/asf/parquet-format/blob/d2697120/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index be1c184..64368de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,19 +143,10 @@
               <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>
                   <excludes>
@@ -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>
@@ -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>
@@ -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>


Mime
View raw message