Repository: tez Updated Branches: refs/heads/branch-0.7 5a0b0265d -> eec72121a
TEZ-2057. tez-dag/pom.xml contains versions for dependencies. (Jonathan Eagles via hitesh) (cherry picked from commit faffae43c5533ce914b4a3d05cc12fb83dfc75fe) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/eec72121 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/eec72121 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/eec72121 Branch: refs/heads/branch-0.7 Commit: eec72121a434c7cbc8788ebcba0467316c40f58c Parents: 5a0b026 Author: Hitesh Shah <[email protected]> Authored: Tue May 12 16:11:47 2015 -0700 Committer: Hitesh Shah <[email protected]> Committed: Tue May 12 16:12:26 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ pom.xml | 17 +++++++++++++++++ tez-dag/pom.xml | 3 --- 3 files changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/eec72121/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9744625..cb2dd3e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,7 @@ INCOMPATIBLE CHANGES Default max limit increased. Should not affect existing users. ALL CHANGES: + TEZ-2057. tez-dag/pom.xml contains versions for dependencies. TEZ-1529. ATS and TezClient integration in secure kerberos enabled cluster. TEZ-2435. Add public key to KEYS TEZ-2421. Deadlock in AM because attempt and vertex locking each other out @@ -182,6 +183,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/eec72121/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5ffe7b4..cc2f20b 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/eec72121/tez-dag/pom.xml ---------------------------------------------------------------------- diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml index 97de918..6033a20 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> @@ -136,13 +135,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>
