Repository: sqoop Updated Branches: refs/heads/sqoop2 0cfeb1982 -> 2f0e73067
SQOOP-1871: Sqoop2: Upgrade to Hadoop 2.6.0 (Richard Zhou via Abraham Elmahrek) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/2f0e7306 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/2f0e7306 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/2f0e7306 Branch: refs/heads/sqoop2 Commit: 2f0e73067fe08f5dc22eb7dbfb560f23ce8fe477 Parents: 0cfeb19 Author: Abraham Elmahrek <[email protected]> Authored: Thu Dec 25 18:08:14 2014 -0800 Committer: Abraham Elmahrek <[email protected]> Committed: Thu Dec 25 18:08:14 2014 -0800 ---------------------------------------------------------------------- pom.xml | 2 +- .../org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/2f0e7306/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index afdeb75..c7c9d78 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ limitations under the License. <commons-compress.version>1.9</commons-compress.version> <derby.version>10.8.2.2</derby.version> <hadoop.1.version>1.0.3</hadoop.1.version> - <hadoop.2.version>2.5.1</hadoop.2.version> + <hadoop.2.version>2.6.0</hadoop.2.version> <guava.version>11.0.2</guava.version> <json-simple.version>1.1</json-simple.version> <junit.version>4.11</junit.version> http://git-wip-us.apache.org/repos/asf/sqoop/blob/2f0e7306/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java b/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java index 4aa8562..1e6706e 100644 --- a/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java +++ b/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java @@ -90,6 +90,7 @@ public class TomcatSqoopMiniCluster extends SqoopMiniCluster { jar.contains("commons-") || // Apache Commons libraries jar.contains("httpcore-") || // Apache Http Core libraries jar.contains("httpclient-") || // Apache Http Client libraries + jar.contains("htrace-") || // htrace-core libraries, new added in Hadoop 2.6.0 jar.contains("log4j-") || // Log4j jar.contains("slf4j-") || // Slf4j jar.contains("jackson-") || // Jackson
