SQOOP-1730: Sqoop2: httpcore and httpclient version has not upgrade after hadoop upgraded
(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/c7b1ac27
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/c7b1ac27
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/c7b1ac27
Branch: refs/heads/cdh5-1.99.4
Commit: c7b1ac272228693cd8807b7a48e4382237a4afa3
Parents: b237373
Author: Abraham Elmahrek <abraham@elmahrek.com>
Authored: Sun Nov 16 12:15:47 2014 -0800
Committer: Abraham Elmahrek <abraham@elmahrek.com>
Committed: Wed Nov 19 16:19:55 2014 -0800
----------------------------------------------------------------------
pom.xml | 16 ++++++++++
test/pom.xml | 15 +++++++++
.../minicluster/TomcatSqoopMiniCluster.java | 33 +++++++++++---------
3 files changed, 49 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/c7b1ac27/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8461357..12b75d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,6 +235,16 @@ limitations under the License.
<artifactId>hadoop-common</artifactId>
<version>${hadoop.2.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -257,6 +267,12 @@ limitations under the License.
<version>${hadoop.2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop.2.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
</profile>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/c7b1ac27/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 5897da8..7877004 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -209,6 +209,16 @@ limitations under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ </exclusions>
<scope>provided</scope>
</dependency>
@@ -229,6 +239,11 @@ limitations under the License.
<artifactId>hadoop-minicluster</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ </dependency>
+
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/c7b1ac27/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 7504e76..4aa8562 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
@@ -86,25 +86,28 @@ public class TomcatSqoopMiniCluster extends SqoopMiniCluster {
List<String> extraClassPath = new LinkedList<String>();
String []classpath = System.getProperty("java.class.path").split(":");
for(String jar : classpath) {
- if(jar.contains("hadoop-") || // Hadoop jars
- jar.contains("commons-") || // Apache Commons libraries
- jar.contains("log4j-") || // Log4j
- jar.contains("slf4j-") || // Slf4j
- jar.contains("jackson-") || // Jackson
- jar.contains("derby") || // Derby drivers
- jar.contains("avro-") || // Avro
- jar.contains("mysql") || // MySQL JDBC driver
- jar.contains("postgre") || // PostgreSQL JDBC driver
- jar.contains("oracle") || // Oracle driver
- jar.contains("terajdbc") || // Teradata driver
- jar.contains("tdgs") || // Teradata driver
- jar.contains("nzjdbc") || // Netezza driver
- jar.contains("sqljdbc") || // Microsoft SQL Server driver
- jar.contains("google") // Google libraries (guava, ...)
+ if(jar.contains("hadoop-") || // Hadoop jars
+ jar.contains("commons-") || // Apache Commons libraries
+ jar.contains("httpcore-") || // Apache Http Core libraries
+ jar.contains("httpclient-") || // Apache Http Client libraries
+ jar.contains("log4j-") || // Log4j
+ jar.contains("slf4j-") || // Slf4j
+ jar.contains("jackson-") || // Jackson
+ jar.contains("derby") || // Derby drivers
+ jar.contains("avro-") || // Avro
+ jar.contains("mysql") || // MySQL JDBC driver
+ jar.contains("postgre") || // PostgreSQL JDBC driver
+ jar.contains("oracle") || // Oracle driver
+ jar.contains("terajdbc") || // Teradata driver
+ jar.contains("tdgs") || // Teradata driver
+ jar.contains("nzjdbc") || // Netezza driver
+ jar.contains("sqljdbc") || // Microsoft SQL Server driver
+ jar.contains("google") // Google libraries (guava, ...)
) {
extraClassPath.add(jar);
}
}
+
container.setExtraClasspath(extraClassPath.toArray(new String[extraClassPath.size()]));
// Finally deploy Sqoop server war file
|