Skip to content

Commit 1e636db

Browse files
author
Sumedh Wale
committed
changed jumbo aws-java-sdk-bundle dependency to only required modules
hadoop-aws depends on aws-java-sdk-bundle which is a really big jar most of which is not used by hadoop-aws, so excluded that dependency and instead add only the individual modules required by hadoop-aws (tested by building hadoop-aws from source with only those dependencies)
1 parent 8c7c02e commit 1e636db

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ allprojects {
111111
junitVersion = '4.12'
112112
mockitoVersion = '1.10.19'
113113
hadoopVersion = '3.2.0'
114+
awsSdkVersion = '1.11.375'
114115
gcsHadoop2ConnectorVersion = 'hadoop2-2.0.0'
115116
gcsHadoop3ConnectorVersion = 'hadoop3-2.0.0'
116117
sparkAvroVersion = '4.0.0'
@@ -242,7 +243,7 @@ if (!hasJdbcConnectorProject) {
242243
String sparkPython = 'python'
243244
def checkResult = exec {
244245
ignoreExitValue = true
245-
commandLine 'sh', '-c', 'python --version | grep -Eq "( 3\\.[0-7])|( 2\\.)"'
246+
commandLine 'sh', '-c', 'python --version 2>/dev/null | grep -Eq "( 3\\.[0-7])|( 2\\.)"'
246247
}
247248
if (checkResult.exitValue != 0) {
248249
checkResult = exec {

cluster/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,13 @@ dependencies {
131131
exclude(group: 'com.google.protobuf', module: 'protobuf-java')
132132
exclude(group: 'com.jcraft', module: 'jsch')
133133
exclude(group: 'org.apache.directory.server', module: 'apacheds-kerberos-codec')
134+
// exclude jumbo aws-java-sdk-bundle and only include individual modules used by hadoop-aws
135+
exclude(group: 'com.amazonaws', module: 'aws-java-sdk-bundle')
134136
}
137+
compile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: awsSdkVersion
138+
compile group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: awsSdkVersion
139+
compile group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: awsSdkVersion
140+
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: jacksonVersion
135141

136142
compile "io.snappydata:spark-metrics:${snappySparkMetricsLibVersion}"
137143

examples/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if (!(new File(rootDir, 'cluster/build.gradle').exists())) {
5858

5959
testCompile "org.scalatest:scalatest_${scalaBinaryVersion}:${scalatestVersion}"
6060
testCompile "commons-io:commons-io:2.6"
61-
testCompile "io.snappydata:gemfire-core:1.6.3"
61+
testCompile project(':snappy-store:gemfire-core')
6262
testRuntime "org.pegdown:pegdown:${pegdownVersion}"
6363
}
6464

spark

Submodule spark updated from 552203b to 1456d1f

0 commit comments

Comments
 (0)