Repository: tez
Updated Branches:
refs/heads/branch-0.6 2b8f0c144 -> a9f107c4c
TEZ-2057. tez-dag/pom.xml contains versions for dependencies. (Jonathan Eagles
via hitesh)
(cherry picked from commit faffae43c5533ce914b4a3d05cc12fb83dfc75fe)
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/a9f107c4
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/a9f107c4
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/a9f107c4
Branch: refs/heads/branch-0.6
Commit: a9f107c4c5b1b1029793c66bd2ef222c52cef976
Parents: 2b8f0c1
Author: Hitesh Shah <[email protected]>
Authored: Tue May 12 16:11:47 2015 -0700
Committer: Hitesh Shah <[email protected]>
Committed: Tue May 12 16:13:21 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
pom.xml | 17 +++++++++++++++++
tez-dag/pom.xml | 3 ---
3 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/a9f107c4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9eae1e3..455fb63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.6.1: Unreleased
INCOMPATIBLE CHANGES
ALL CHANGES:
+ TEZ-2057. tez-dag/pom.xml contains versions for dependencies.
TEZ-2282. Delimit reused yarn container logs (stderr, stdout, syslog) with
task attempt start/stop events
TEZ-1529. ATS and TezClient integration in secure kerberos enabled cluster.
TEZ-2396. pig-tez-tfile-parser pom is hard coded to depend on 0.6.0-SNAPSHOT
version.
http://git-wip-us.apache.org/repos/asf/tez/blob/a9f107c4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9bb91aa..020ebb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,6 +195,18 @@
<version>2.6</version>
</dependency>
<dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>compile</scope>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <scope>compile</scope>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
@@ -434,6 +446,11 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-web-proxy</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-tests</artifactId>
<version>${hadoop.version}</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/tez/blob/a9f107c4/tez-dag/pom.xml
----------------------------------------------------------------------
diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml
index a2ba0ed..a894813 100644
--- a/tez-dag/pom.xml
+++ b/tez-dag/pom.xml
@@ -79,7 +79,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-web-proxy</artifactId>
- <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -140,13 +139,11 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<scope>compile</scope>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>compile</scope>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
