merge -r 1310035:1310036 from trunk. FIXES: HADOOP-8180

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310037 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-04-05 19:40:04 +00:00
parent 5932e06047
commit 53c866784b
3 changed files with 3 additions and 10 deletions

View File

@ -284,6 +284,9 @@ Release 0.23.3 - UNRELEASED
HADOOP-6963. In FileUtil.getDU(..), neither include the size of directories
nor follow symbolic links. (Ravi Prakash via szetszwo)
HADOOP-8180. Remove hsqldb since its not needed from pom.xml (Ravi Prakash
via tgraves)
Release 0.23.2 - UNRELEASED
NEW FEATURES

View File

@ -199,11 +199,6 @@
<artifactId>commons-configuration</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>

View File

@ -510,11 +510,6 @@
<artifactId>commons-configuration</artifactId>
<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>