From 1e636db884a0e8b0bc9c643f238c309b9a6b96dc Mon Sep 17 00:00:00 2001
From: Sumedh Wale <swale@tibco.com>
Date: Sat, 26 Jun 2021 21:05:52 +0530
Subject: [PATCH] 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)
---
 build.gradle          | 3 ++-
 cluster/build.gradle  | 6 ++++++
 examples/build.gradle | 2 +-
 spark                 | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 58d33ad03e..dbbe9ec47a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -111,6 +111,7 @@ allprojects {
     junitVersion = '4.12'
     mockitoVersion = '1.10.19'
     hadoopVersion = '3.2.0'
+    awsSdkVersion = '1.11.375'
     gcsHadoop2ConnectorVersion = 'hadoop2-2.0.0'
     gcsHadoop3ConnectorVersion = 'hadoop3-2.0.0'
     sparkAvroVersion = '4.0.0'
@@ -242,7 +243,7 @@ if (!hasJdbcConnectorProject) {
 String sparkPython = 'python'
 def checkResult = exec {
   ignoreExitValue = true
-  commandLine 'sh', '-c', 'python --version | grep -Eq "( 3\\.[0-7])|( 2\\.)"'
+  commandLine 'sh', '-c', 'python --version 2>/dev/null | grep -Eq "( 3\\.[0-7])|( 2\\.)"'
 }
 if (checkResult.exitValue != 0) {
   checkResult = exec {
diff --git a/cluster/build.gradle b/cluster/build.gradle
index 72de2630e2..afb32baca0 100644
--- a/cluster/build.gradle
+++ b/cluster/build.gradle
@@ -131,7 +131,13 @@ dependencies {
     exclude(group: 'com.google.protobuf', module: 'protobuf-java')
     exclude(group: 'com.jcraft', module: 'jsch')
     exclude(group: 'org.apache.directory.server', module: 'apacheds-kerberos-codec')
+    // exclude jumbo aws-java-sdk-bundle and only include individual modules used by hadoop-aws
+    exclude(group: 'com.amazonaws', module: 'aws-java-sdk-bundle')
   }
+  compile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: awsSdkVersion
+  compile group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: awsSdkVersion
+  compile group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: awsSdkVersion
+  compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: jacksonVersion
 
   compile "io.snappydata:spark-metrics:${snappySparkMetricsLibVersion}"
 
diff --git a/examples/build.gradle b/examples/build.gradle
index b3cdd07e20..e8a0ec50e6 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -58,7 +58,7 @@ if (!(new File(rootDir, 'cluster/build.gradle').exists())) {
 
   testCompile "org.scalatest:scalatest_${scalaBinaryVersion}:${scalatestVersion}"
   testCompile "commons-io:commons-io:2.6"
-  testCompile "io.snappydata:gemfire-core:1.6.3"
+  testCompile project(':snappy-store:gemfire-core')
   testRuntime "org.pegdown:pegdown:${pegdownVersion}"
 }
 
diff --git a/spark b/spark
index 552203b5be..1456d1fd14 160000
--- a/spark
+++ b/spark
@@ -1 +1 @@
-Subproject commit 552203b5becb1470cb215980a1b63e39c3af82e7
+Subproject commit 1456d1fd14e07d64dbb115b4a94c8933894a95e1