sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject sqoop git commit: SQOOP-1730: Sqoop2: httpcore and httpclient version has not upgrade after hadoop upgraded
Date Sun, 16 Nov 2014 20:22:58 GMT
Repository: sqoop
Updated Branches:
  refs/heads/sqoop2 716d05055 -> 7116bc2e1


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/7116bc2e
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/7116bc2e
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/7116bc2e

Branch: refs/heads/sqoop2
Commit: 7116bc2e1c27c10f528d824105c1cf192af91403
Parents: 716d050
Author: Abraham Elmahrek <abraham@elmahrek.com>
Authored: Sun Nov 16 12:15:47 2014 -0800
Committer: Abraham Elmahrek <abraham@elmahrek.com>
Committed: Sun Nov 16 12:15:47 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/7116bc2e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ff51d1..233d3ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,6 +191,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>
@@ -213,6 +223,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/7116bc2e/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 28a1e66..2dbb8c5 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -219,6 +219,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>
 
@@ -239,6 +249,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/7116bc2e/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


Mime
View raw message