Author: tgraves Date: Thu Apr 5 19:40:04 2012 New Revision: 1310037 URL: http://svn.apache.org/viewvc?rev=1310037&view=rev Log: merge -r 1310035:1310036 from trunk. FIXES: HADOOP-8180
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1310037&r1=1310036&r2=1310037&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Thu Apr 5 19:40:04 2012 @@ -511,11 +511,6 @@ <version>1.6</version> </dependency> <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.7</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>1.6.1</version>