Merged revision 1459673 from tomcat/trunk:
jdbc-pool tests need JUnit 4.
Use the same version of junit as used by Tomcat.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1459674 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1459681 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54599
jdbc-pool: Do not expose connection password via DataSource.toString().
Based on a patch by Daniel Mikusa

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1459683 13f79535-47bb-0310-9956-ffa450edef68