You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by zj...@apache.org on 2016/01/20 23:37:34 UTC

[03/15] tez git commit: TEZ-2639

TEZ-2639

(cherry picked from commit 3f497c397ce0604f6838786ad8fe098985f92829)


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

Branch: refs/heads/branch-0.7
Commit: a2988136eaf911dcfe3287e1c228bd1a0219a350
Parents: eebd436
Author: Bikas Saha <bi...@apache.org>
Authored: Thu Jul 23 16:37:20 2015 -0700
Committer: Jeff Zhang <zj...@apache.org>
Committed: Wed Jan 20 14:32:06 2016 -0800

----------------------------------------------------------------------
 tez-dist/LICENSE-full.txt | 15 +++++++++++++--
 tez-dist/NOTICE-full.txt  |  6 +++++-
 2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/a2988136/tez-dist/LICENSE-full.txt
----------------------------------------------------------------------
diff --git a/tez-dist/LICENSE-full.txt b/tez-dist/LICENSE-full.txt
index 684b55b..8e22b72 100644
--- a/tez-dist/LICENSE-full.txt
+++ b/tez-dist/LICENSE-full.txt
@@ -257,10 +257,17 @@ license:
   - hadoop-yarn-common-*.jar
   - hadoop-yarn-server-common-*.jar
   - hadoop-yarn-server-web-proxy-*.jar
+  - httpclient-*.jar
+  - httpcore-*.jar
+  - jackson-core-asl-*.jar
+  - jackson-jaxrs-*.jar
+  - jackson-mapper-asl-*.jar
+  - jackson-xc-*.jar
+  - javax.inject-1.jar
   - guava-*.jar
   - jettison-*.jar - Copyright 2006 Envoi Solutions LLC
-  - jetty-6.1.*.jar 
-  - jetty-utils-6.1.*.jar 
+  - jetty-6.1.*.jar - Copyright 2001-2005 Mort Bay Consulting Pty. Ltd.
+  - jetty-utils-6.1.*.jar - Copyright 2001-2005 Mort Bay Consulting Pty. Ltd.
 
 -----------------------------------------------------------------------
 Dual Licensed under Common Development And Disribution License (CDDL - Version 1.1)
@@ -272,8 +279,12 @@ The Apache TEZ binary distribution bundles the following files under the dual li
  CDDL License and GPL version 2 with the [“Classpath Exception”]:
 
   - jersey-client-*.jar
+  - jersey-core-*.jar
+  - jersey-guice-*.jar
   - jersey-json-*.jar
   - servlet-api-*.jar
+  - jaxb-api-*.jar
+  - jaxb-impl-*.jar
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
 

http://git-wip-us.apache.org/repos/asf/tez/blob/a2988136/tez-dist/NOTICE-full.txt
----------------------------------------------------------------------
diff --git a/tez-dist/NOTICE-full.txt b/tez-dist/NOTICE-full.txt
index 9e9472d..bc285e9 100644
--- a/tez-dist/NOTICE-full.txt
+++ b/tez-dist/NOTICE-full.txt
@@ -9,9 +9,13 @@ jersey-guice and jersey-json.  The details on how to obtain those
 modules are available at https://jersey.java.net/.
 
 This product includes javax.servlet-api library. The details on
-how to obtain the library is available at
+how to obtain the library are available at
 http://servlet-spec.java.net/.
 
+This produce includes jaxb-api-2.2.2, jaxb-impl-2.2.3-1 libraries. 
+The details on how to obtain the library are available at 
+https://jaxb.java.net/
+
 This product bundles the tez-ui war which includes fonts protected
 under the Open Font License.  These fonts can only be distributed
 as part of a piece of software, but not individually.