You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by bo...@apache.org on 2018/10/24 15:19:54 UTC

sqoop git commit: SQOOP-3398: Tests using HiveMiniCluster can be unstable on some platforms

Repository: sqoop
Updated Branches:
  refs/heads/trunk 9e328a53e -> f6455c864


SQOOP-3398: Tests using HiveMiniCluster can be unstable on some platforms

(Szabolcs Vasas via Boglarka Egyed)


Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/f6455c86
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/f6455c86
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/f6455c86

Branch: refs/heads/trunk
Commit: f6455c86486e48dacd67885fb2b1d29aaed32c67
Parents: 9e328a5
Author: Boglarka Egyed <bo...@apache.org>
Authored: Wed Oct 24 17:18:57 2018 +0200
Committer: Boglarka Egyed <bo...@apache.org>
Committed: Wed Oct 24 17:18:57 2018 +0200

----------------------------------------------------------------------
 build.gradle | 16 ++++++++++++----
 ivy.xml      | 11 +++++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sqoop/blob/f6455c86/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 2340bce..2014b5c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,10 +91,18 @@ def sqoopThirdPartyLib = System.getProperty("sqoop.thirdparty.lib.dir")
 dependencies {
     if (sqoopThirdPartyLib != null) runtime fileTree(dir: sqoopThirdPartyLib, include: '*.jar')
     compile group: 'org.apache.hadoop', name: 'hadoop-aws', version: hadoopVersion
-    compile group: 'org.apache.hadoop', name: 'hadoop-common', version: hadoopVersion
-    compile group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: hadoopVersion
-    compile group: 'org.apache.hadoop', name: 'hadoop-mapreduce-client-common', version: hadoopVersion
-    compile group: 'org.apache.hadoop', name: 'hadoop-mapreduce-client-core', version: hadoopVersion
+    compile (group: 'org.apache.hadoop', name: 'hadoop-common', version: hadoopVersion) {
+        exclude group: "asm", module: "asm"
+    }
+    compile (group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: hadoopVersion) {
+        exclude group: "asm", module: "asm"
+    }
+    compile (group: 'org.apache.hadoop', name: 'hadoop-mapreduce-client-common', version: hadoopVersion) {
+        exclude group: "asm", module: "asm"
+    }
+    compile (group: 'org.apache.hadoop', name: 'hadoop-mapreduce-client-core', version: hadoopVersion) {
+        exclude group: "asm", module: "asm"
+    }
     compile group: 'org.apache.hbase', name: 'hbase-hadoop-compat', version: hbaseVersion
 
     aopCompile group: 'org.aspectj', name: 'aspectjtools', version: aspectjVersion

http://git-wip-us.apache.org/repos/asf/sqoop/blob/f6455c86/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 6805fc3..23a267d 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -66,16 +66,22 @@ under the License.
       rev="${hadoop.version}" conf="common->default">
       <artifact name="hadoop-common" type="jar" />
       <artifact name="hadoop-common" type="jar" m:classifier="tests"/>
+      <exclude org="asm" module="asm" />
     </dependency>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs"
       rev="${hadoop.version}" conf="common->default">
       <artifact name="hadoop-hdfs" type="jar" />
       <artifact name="hadoop-hdfs" type="jar" m:classifier="tests"/>
+      <exclude org="asm" module="asm" />
     </dependency>
     <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-common"
-      rev="${hadoop.version}" conf="common->default"/>
+      rev="${hadoop.version}" conf="common->default">
+      <exclude org="asm" module="asm" />
+    </dependency>
     <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
-      rev="${hadoop.version}" conf="common->default"/>
+      rev="${hadoop.version}" conf="common->default">
+      <exclude org="asm" module="asm" />
+    </dependency>
     <dependency org="org.apache.hadoop" name="hadoop-aws"
                 rev="${hadoop.version}" conf="common->default"/>
     <dependency org="org.aspectj" name="aspectjtools" rev="${aspectj.version}"
@@ -202,6 +208,7 @@ under the License.
 
     <dependency org="org.apache.hive" name="hive-jdbc" rev="${hcatalog.version}" conf="common->default" >
       <exclude org="com.twitter" module="parquet-hadoop-bundle"/>
+      <exclude org="asm" module="asm" />
     </dependency>
 
     <dependency org="org.apache.hive.hcatalog" name="hive-hcatalog-core"