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/08/10 08:25:15 UTC
sqoop git commit: SQOOP-3360: Fix hive-exec dependency issues in
Gradle
Repository: sqoop
Updated Branches:
refs/heads/trunk c3d916ab2 -> ec18e6f47
SQOOP-3360: Fix hive-exec dependency issues in Gradle
(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/ec18e6f4
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/ec18e6f4
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/ec18e6f4
Branch: refs/heads/trunk
Commit: ec18e6f47ebe4308495052afb4a2fd6f9ad0102d
Parents: c3d916a
Author: Boglarka Egyed <bo...@apache.org>
Authored: Fri Aug 10 10:23:48 2018 +0200
Committer: Boglarka Egyed <bo...@apache.org>
Committed: Fri Aug 10 10:23:48 2018 +0200
----------------------------------------------------------------------
build.gradle | 5 +++++
gradle.properties | 2 ++
ivy.xml | 5 +++++
ivy/libraries.properties | 1 +
4 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/ec18e6f4/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index e2c4479..99a4e24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,6 +80,7 @@ configurations.all {
resolutionStrategy {
force group: 'org.apache.avro', name: 'avro', version: avroVersion
force group: 'org.apache.avro', name: 'avro-mapred', version: avroVersion
+ force group: 'com.google.guava', name: 'guava', version: guavaVersion
}
exclude group: 'org.apache.hadoop', module: 'avro'
}
@@ -106,7 +107,11 @@ dependencies {
common group: 'org.apache.hbase', name: 'hbase-common', version: hbaseVersion
common (group: 'org.apache.hive.hcatalog', name: 'hive-hcatalog-core', version: hcatalogVersion) {
exclude group: 'org.apache.avro', module: 'avro'
+ exclude group: 'org.apache.hive', module: 'hive-exec'
}
+ common group: 'org.apache.hive', name: 'hive-exec', version: hcatalogVersion, classifier: 'core'
+ // Kryo is a dependency of hive-exec:core
+ common group: 'com.esotericsoftware.kryo', name: 'kryo', version: kryoVersion
common (group: 'org.apache.hive', name: 'hive-jdbc', version: hcatalogVersion) {
exclude group: 'org.apache.avro', module: 'avro'
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/ec18e6f4/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 2d6c259..a71729e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,6 +26,8 @@ aspectjVersion=1.7.4
zookeeperVersion=3.4.6
hbaseVersion=1.2.4
hcatalogVersion=1.2.1
+kryoVersion=2.22
+guavaVersion=14.0.1
accumuloVersion=1.6.2
http://git-wip-us.apache.org/repos/asf/sqoop/blob/ec18e6f4/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 796ef70..e55172e 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -204,8 +204,13 @@ under the License.
rev="${hcatalog.version}" conf="common->default">
<artifact name="hive-hcatalog-core" type="jar"/>
<exclude org="org.apache.avro" module="avro" />
+ <exclude org="org.apache.hive" module="hive-exec" />
</dependency>
+ <dependency org="org.apache.hive" name="hive-exec" rev="${hcatalog.version}" conf="common->default" m:classifier="core" />
+ <!-- Kryo is a dependency of hive-exec:core -->
+ <dependency org="com.esotericsoftware.kryo" name="kryo" rev="${kryo.version}" conf="common->default" />
+
<dependency org="org.postgresql" name="postgresql"
rev="${postgresql.version}" conf="common->default" />
http://git-wip-us.apache.org/repos/asf/sqoop/blob/ec18e6f4/ivy/libraries.properties
----------------------------------------------------------------------
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index d679b12..2f1ec9e 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -58,6 +58,7 @@ slf4j.version=1.7.7
hadoop.version=2.8.0
hbase.version=1.2.4
hcatalog.version=1.2.1
+kryo.version=2.22
jackson-databind.version=2.9.5
parquet.version=1.6.0