You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by je...@apache.org on 2017/01/26 21:45:32 UTC

tez git commit: TEZ-3590. Remove google.protobuf from the tez-auxservices shaded jar (jeagles)

Repository: tez
Updated Branches:
  refs/heads/TEZ-3334 0ac846ec5 -> 4b30f8e2c


TEZ-3590. Remove google.protobuf from the tez-auxservices shaded jar (jeagles)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/4b30f8e2
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/4b30f8e2
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/4b30f8e2

Branch: refs/heads/TEZ-3334
Commit: 4b30f8e2c74ba0b274cf3cc1dcfd01bf8c62d525
Parents: 0ac846e
Author: Jonathan Eagles <je...@yahoo-inc.com>
Authored: Thu Jan 26 15:44:42 2017 -0600
Committer: Jonathan Eagles <je...@yahoo-inc.com>
Committed: Thu Jan 26 15:44:42 2017 -0600

----------------------------------------------------------------------
 TEZ-3334-CHANGES.txt                 | 1 +
 tez-plugins/tez-aux-services/pom.xml | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/4b30f8e2/TEZ-3334-CHANGES.txt
----------------------------------------------------------------------
diff --git a/TEZ-3334-CHANGES.txt b/TEZ-3334-CHANGES.txt
index d7c9e30..4703d95 100644
--- a/TEZ-3334-CHANGES.txt
+++ b/TEZ-3334-CHANGES.txt
@@ -4,6 +4,7 @@ Apache Tez Change Log
 INCOMPATIBLE CHANGES:
 
 ALL CHANGES:
+  TEZ-3590. Remove google.protobuf from the tez-auxservices shaded jar
   TEZ-3587. Fetcher fetchInputs() can NPE on srcAttempt due to missing entry in pathToAttemptMap
   TEZ-3586. Remove fusesource.leveldbjni from the tez-auxservices shaded jar
   TEZ-3532. Backport MAPREDUCE-6808. Log map attempts as part of shuffle handler audit log

http://git-wip-us.apache.org/repos/asf/tez/blob/4b30f8e2/tez-plugins/tez-aux-services/pom.xml
----------------------------------------------------------------------
diff --git a/tez-plugins/tez-aux-services/pom.xml b/tez-plugins/tez-aux-services/pom.xml
index 84006bb..6a5be45 100644
--- a/tez-plugins/tez-aux-services/pom.xml
+++ b/tez-plugins/tez-aux-services/pom.xml
@@ -81,6 +81,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.fusesource.leveldbjni</groupId>
@@ -187,10 +188,6 @@
                   <shadedPattern>org.apache.tez.shaded.$0</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>com.google.protobuf</pattern>
-                  <shadedPattern>org.apache.tez.shaded.$0</shadedPattern>
-                </relocation>
-                <relocation>
                   <pattern>org.apache.commons</pattern>
                   <shadedPattern>org.apache.tez.shaded.$0</shadedPattern>
                 </relocation>