Author: tucu
Date: Mon Aug 6 18:15:35 2012
New Revision: 1369908
URL: http://svn.apache.org/viewvc?rev=1369908&view=rev
Log:
Merge -r 1369905:1369906 from trunk to branch. FIXES: MAPREDUCE-4498
Modified:
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
hadoop/common/branches/branch-2/hadoop-project/pom.xml
Modified:
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1369908&r1=1369907&r2=1369908&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Mon Aug 6 18:15:35 2012
@@ -153,10 +153,18 @@
<excludes>
<exclude>org.apache.hadoop:hadoop-common</exclude>
<exclude>org.apache.hadoop:hadoop-hdfs</exclude>
- <!-- use slf4j from common to avoid multiple binding warnings -->
- <exclude>org.slf4j:slf4j-api</exclude>
- <exclude>org.slf4j:slf4j-log4j12</exclude>
+ <!-- use slf4j from common to avoid multiple binding warnings -->
+ <exclude>org.slf4j:slf4j-api</exclude>
+ <exclude>org.slf4j:slf4j-log4j12</exclude>
+ <exclude>org.hsqldb:hsqldb</exclude>
</excludes>
</dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+
<outputDirectory>/share/hadoop/${hadoop.component}/lib-examples</outputDirectory>
+ <includes>
+ <include>org.hsqldb:hsqldb</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
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=1369908&r1=1369907&r2=1369908&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Mon Aug 6 18:15:35
2012
@@ -657,6 +657,11 @@
<!-- Use the version needed by maven-clover-plugin -->
<version>3.0.2</version>
</dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>2.0.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
