streamlined gradle in the ES modules

modules depending on ES sources are now having different javac options

app/build.gradle

@@ -20,8 +20,8 @@ configurations {
     }
 }
 
+evaluationDependsOn(':es')
 evaluationDependsOn(':core')
-evaluationDependsOn(':es:es-core')
 evaluationDependsOn(':sql')
 evaluationDependsOn(':sql-parser')
 evaluationDependsOn(':blob')

azure-discovery/build.gradle

@@ -1,5 +1,4 @@
 apply from: "$rootDir/gradle/javaModule.gradle"
-apply plugin: 'idea'
 
 archivesBaseName = 'crate-azure-discovery'
 group = 'io.crate'

build.gradle

@@ -162,7 +162,6 @@ project.gradle.addListener(new TestListener() {
 def jacocoProjects() {
     subprojects.findAll {
         !['es-core',
-          'es-client',
           'es-testing',
           'es-discovery-multicast',
           'es-cloud-aws',

es-repository-hdfs/build.gradle

@@ -2,7 +2,6 @@ plugins {
     id "de.undercouch.download" version "2.1.0"
 }
 apply from: "$rootDir/gradle/javaModule.gradle"
-apply plugin: 'idea'
 
 description = 'Elasticsearch HDFS Repository'
 

es/build.gradle

@@ -1,18 +1,34 @@
 subprojects {
+
+    // all subprojects in this folder are using only the elasticsearch
+    // upstream source under upstream. we do not share the java
+    // configuration of the other top level modules since we do want
+    // to ignore compiler warnings
+
+    apply plugin: 'java'
+    apply plugin: 'maven'
+
+    repositories {
+        mavenCentral()
+    }
+
+    sourceCompatibility = "8"
+    targetCompatibility = "8"
+
     compileJava {
-        // upstream code - not interested in any warnings
         options.warnings = false
         options.deprecation = false
         options.compilerArgs << '-XDignore.symbol.file'
         options.fork = true
         options.forkOptions.executable = 'javac'
     }
+
     compileTestJava {
-        // upstream code - not interested in any warnings
         options.warnings = false
         options.deprecation = false
         options.compilerArgs << '-XDignore.symbol.file'
     }
+
     test {
         enabled = false
         jacoco {

es/es-cloud-aws/build.gradle

@@ -1,6 +1,3 @@
-apply from: "$rootDir/gradle/javaModule.gradle"
-apply plugin: 'idea'
-
 dependencies {
     compile project(':es:es-core')
     compile "com.amazonaws:aws-java-sdk-ec2:${versions.aws}"

es/es-core/build.gradle

@@ -1,5 +1,3 @@
-apply from: "$rootDir/gradle/javaModule.gradle"
-
 dependencies {
     // start ES compile dependencies
     // generated in upstream directory with:

es/es-discovery-multicast/build.gradle

@@ -1,6 +1,3 @@
-apply from: "$rootDir/gradle/javaModule.gradle"
-apply plugin: 'idea'
-
 dependencies {
     compile project(':es:es-core')
 }

es/es-testing/build.gradle

@@ -1,5 +1,3 @@
-apply from: "$rootDir/gradle/javaModule.gradle"
-
 dependencies {
     compile project(':es:es-core')
 

settings.gradle

@@ -1,5 +1,8 @@
-include 'es:es-core',
+include 'es',
+        'es:es-core',
         'es:es-testing',
+        'es:es-cloud-aws',
+        'es:es-discovery-multicast',
         'testing',
         'core',
         'blob',
@@ -9,10 +12,8 @@ include 'es:es-core',
         'udc',
         'azure-discovery',
         'dns-discovery',
-        'sigar',
-        'es:es-cloud-aws',
-        'es:es-discovery-multicast',
         'es-repository-hdfs',
+        'sigar',
         'app',
         'blackbox'
 

sql/build.gradle

@@ -1,5 +1,4 @@
 apply from: "$rootDir/gradle/javaModule.gradle"
-apply plugin: 'idea'
 apply plugin: 'groovy'
 apply plugin: 'de.thetaphi.forbiddenapis'