Initial modifications for newer junit API
Fixed incorrect junit version
jets3t pom version and code modifications
Addition of jersey-servlet and version update
Add version field for jetty dependencies
Add jersey-servlet dep
Initial pom updates for tomcat5,6->7
Remove duplicate dependency/exclusion entries for tomcat-jasper
Fixed up jasper aId in hdfs pom
Update hdfs to use TC6 for jspc
Merge branch 'branch-2' into fedora-patch-math
Merge branch 'branch-2' into fedora-patch-junit
Merge branch 'branch-2' into fedora-patch-jetty

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
Merge branch 'branch-2' into fedora-patch-jets3t
Merge branch 'branch-2' into fedora-patch-jersey
Merge branch 'branch-2' into fedora-patch-javadocs
Merge branch 'branch-2' into fedora-patch-jasper
Deleted unused import
HADOOP-9607. Fixes in Javadoc build. Contributed by Timothy St. Clair

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487981 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487982 13f79535-47bb-0310-9956-ffa450edef68