Merge pull request #2323 from crate/h/compile-ec2-discovery

compile ec2-discovery module
crate · Jul 17, 2015 · 3f7d752 · 3f7d752
2 parents 4fe31a4 + 29736fb
commit 3f7d752
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/ec2-discovery/build.gradle b/ec2-discovery/build.gradle
@@ -6,7 +6,22 @@ group = 'io.crate'
 dependencies {
     compile project(':es')
     compile project(':core')
-    compile 'com.amazonaws:aws-java-sdk:1.9.34'
+    compile 'com.amazonaws:aws-java-sdk-ec2:1.9.34'
+    compile 'com.amazonaws:aws-java-sdk-s3:1.9.34'
     testCompile project(':testing')
 }
 
+sourceSets {
+    main {
+        java {
+            srcDir 'upstream/src/main/java'
+            exclude 'org/elasticsearch/plugin/**'
+            exclude 'org/elasticsearch/respositories/**'
+        }
+    }
+    test {
+        java {
+            srcDir 'upstream/src/test/java'
+        }
+    }
+}
diff --git a/ec2-discovery/upstream b/ec2-discovery/upstream
diff --git a/sql/build.gradle b/sql/build.gradle
@@ -15,7 +15,8 @@ dependencies {
     compile project(':core')
     compile project(':blob')
     compile project(':sql-parser')
-    compile 'com.amazonaws:aws-java-sdk:1.9.34'
+    compile 'com.amazonaws:aws-java-sdk-ec2:1.9.34'
+    compile 'com.amazonaws:aws-java-sdk-s3:1.9.34'
     compile 'org.apache.commons:commons-math3:3.4.1'
     testCompile project(':testing')
     testCompile 'org.skyscreamer:jsonassert:1.2.0'