[Backport] Avoid sharing source directories as it breaks intellij (#4…

…0877) (#41026)

* Avoid sharing source directories as it breaks intellij (#40877)

(cherry picked from commit 71d407f)

build.gradle

@@ -360,14 +360,6 @@ gradle.projectsEvaluated {
       integTest.mustRunAfter test
     }
     configurations.all { Configuration configuration ->
-      /*
-       * The featureAwarePlugin configuration has a dependency on x-pack:plugin:core and x-pack:plugin:core has a dependency on the
-       * featureAwarePlugin configuration. The below task ordering logic would force :x-pack:plugin:core:test
-       * :x-pack:test:feature-aware:test to depend on each other circularly. We break that cycle here.
-       */
-      if (configuration.name == "featureAwarePlugin") {
-        return
-      }
       dependencies.all { Dependency dep ->
         Project upstreamProject = dependencyToProject(dep)
         if (upstreamProject != null) {
@@ -379,7 +371,7 @@ gradle.projectsEvaluated {
             Task task = project.tasks.findByName(taskName)
             Task upstreamTask = upstreamProject.tasks.findByName(taskName)
             if (task != null && upstreamTask != null) {
-              task.mustRunAfter(upstreamTask)
+              task.shouldRunAfter(upstreamTask)
             }
           }
         }
@@ -404,21 +396,6 @@ allprojects {
       // also ignore other possible build dirs
       excludeDirs += file('build')
       excludeDirs += file('build-eclipse')
-
-      iml {
-        // fix so that Gradle idea plugin properly generates support for resource folders
-        // see also https://issues.gradle.org/browse/GRADLE-2975
-        withXml {
-          it.asNode().component.content.sourceFolder.findAll { it.@url == 'file://$MODULE_DIR$/src/main/resources' }.each {
-            it.attributes().remove('isTestSource')
-            it.attributes().put('type', 'java-resource')
-          }
-          it.asNode().component.content.sourceFolder.findAll { it.@url == 'file://$MODULE_DIR$/src/test/resources' }.each {
-            it.attributes().remove('isTestSource')
-            it.attributes().put('type', 'java-test-resource')
-          }
-        }
-      }
     }
   }
 
@@ -436,14 +413,6 @@ idea {
     vcs = 'Git'
   }
 }
-// Make sure gradle idea was run before running anything in intellij (including import).
-File ideaMarker = new File(projectDir, '.local-idea-is-configured')
-tasks.idea.doLast {
-  ideaMarker.setText('', 'UTF-8')
-}
-if (System.getProperty('idea.active') != null && ideaMarker.exists() == false) {
-  throw new GradleException('You must run `gradle idea` from the root of elasticsearch before importing into IntelliJ')
-}
 
 // eclipse configuration
 allprojects {

qa/full-cluster-restart/build.gradle

@@ -107,3 +107,16 @@ task bwcTestSnapshots {
 }
 
 check.dependsOn(bwcTestSnapshots)
+
+configurations {
+  testArtifacts.extendsFrom testRuntime
+}
+
+task testJar(type: Jar) {
+  appendix 'test'
+  from sourceSets.test.output
+}
+
+artifacts {
+  testArtifacts testJar
+}

x-pack/plugin/core/build.gradle

@@ -44,6 +44,9 @@ dependencies {
     testCompile project(path: ':modules:reindex', configuration: 'runtime')
     testCompile project(path: ':modules:parent-join', configuration: 'runtime')
     testCompile project(path: ':modules:analysis-common', configuration: 'runtime')
+    testCompile(project(':x-pack:license-tools')) {
+        transitive = false
+    }
     testCompile ("org.elasticsearch.client:elasticsearch-rest-high-level-client:${version}")
 }
 
@@ -91,8 +94,8 @@ licenseHeaders {
 }
 
 // make LicenseSigner available for testing signed licenses
-sourceSets.test.java {
-    srcDir '../../license-tools/src/main/java'
+sourceSets.test.resources {
+    srcDir 'src/main/config'
 }
 
 unitTest {

x-pack/plugin/security/build.gradle

@@ -125,6 +125,11 @@ dependencies {
 compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"
 compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"
 
+processTestResources {
+    from(project(xpackModule('core')).file('src/main/config'))
+    from(project(xpackModule('core')).file('src/test/resources'))
+}
+
 configurations {
     testArtifacts.extendsFrom testRuntime
 }
@@ -144,13 +149,6 @@ processResources {
     }
 }
 
-sourceSets.test.resources {
-    srcDir '../core/src/test/resources'
-    // this is required because audit logging tests (LoggingAuditTrailTests)
-    // parse the actual log4j2.properties config file to extract and test
-    // the log line pattern. These tests need access to the file as a resource.
-    srcDir '../core/src/main/config'
-}
 dependencyLicenses {
     mapping from: /java-support|opensaml-.*/, to: 'shibboleth'
     mapping from: /http.*/, to: 'httpclient'

x-pack/plugin/sql/qa/security/build.gradle

@@ -13,15 +13,20 @@ subprojects {
   // Use resources from the parent project in subprojects
   sourceSets {
     test {
-      java {
-        srcDirs = ["${mainProject.projectDir}/src/test/java"]
-      }
-      resources {
-        srcDirs = ["${mainProject.projectDir}/src/test/resources"]
+      mainProject.sourceSets.test.output.classesDirs.each { dir ->
+        output.addClassesDir { dir }
       }
+      runtimeClasspath += mainProject.sourceSets.test.output
     }
   }
 
+  processTestResources {
+    from mainProject.file('src/test/resources')
+  }
+
+  // subprojects don't contain source so ignore
+  licenseHeaders.enabled = false
+
   dependencies {
     testCompile "org.elasticsearch.plugin:x-pack-core:${version}"
   }

x-pack/qa/full-cluster-restart/build.gradle

@@ -25,6 +25,7 @@ dependencies {
         // This is total #$%, but the solution is to get the SAML realm (which uses guava) out of security proper
         exclude group: "com.google.guava", module: "guava"
     }
+    testCompile project(path: ':qa:full-cluster-restart', configuration: 'testArtifacts')
 }
 
 Closure waitWithAuth = { NodeInfo node, AntBuilder ant ->
@@ -72,15 +73,6 @@ Closure waitWithAuth = { NodeInfo node, AntBuilder ant ->
 
 Project mainProject = project
 
-String coreFullClusterRestartPath = project(':qa:full-cluster-restart').projectDir.toPath().resolve('src/test/java').toString()
-sourceSets {
-    test {
-        java {
-            srcDirs += [coreFullClusterRestartPath]
-        }
-    }
-}
-
 licenseHeaders {
     approvedLicenses << 'Apache'
 }
@@ -90,7 +82,7 @@ forbiddenPatterns {
 }
 
 // tests are pushed down to subprojects
-testingConventions.enabled = false 
+testingConventions.enabled = false
 
 /**
  * Subdirectories of this project are test rolling upgrades with various
@@ -105,22 +97,22 @@ subprojects {
 
   apply plugin: 'elasticsearch.standalone-test'
 
-  // Use resources from the rolling-upgrade project in subdirectories
   sourceSets {
     test {
-      java {
-        srcDirs = ["${mainProject.projectDir}/src/test/java", coreFullClusterRestartPath]
-      }
-      resources {
-        srcDirs = ["${mainProject.projectDir}/src/test/resources"]
+      mainProject.sourceSets.test.output.classesDirs.each { dir ->
+        output.addClassesDir { dir }
       }
+      runtimeClasspath += mainProject.sourceSets.test.output
     }
   }
 
-  licenseHeaders {
-    approvedLicenses << 'Apache'
+  processTestResources {
+    from mainProject.file('src/test/resources')
   }
 
+  // subprojects don't contain source so ignore
+  licenseHeaders.enabled = false
+
   forbiddenPatterns {
     exclude '**/system_key'
   }
@@ -194,7 +186,7 @@ subprojects {
       extraConfigFile 'testnode.crt', new File(outputDir + '/testnode.crt')
       extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks')
       if (version.before('5.1.2')) {
-        // Disable monitoring if version is before 5.1.2 because form 5.1.2 we changed how we get DocStats 
+        // Disable monitoring if version is before 5.1.2 because form 5.1.2 we changed how we get DocStats
         // and we can get a negative value which cannot because serialised by <5.1.2 as it writes VLongs
         setting 'xpack.monitoring.enabled', 'false'
       }
@@ -275,7 +267,7 @@ subprojects {
       bwcTest.dependsOn(versionBwcTest)
     }
   }
-    
+
   unitTest.enabled = false // no unit tests for full cluster restarts, only the rest integration test
 
   // basic integ tests includes testing bwc against the most recent version
@@ -295,6 +287,7 @@ subprojects {
       testCompile project(path: xpackModule('watcher'), configuration: 'runtime')
       testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
       testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
+      testCompile project(path: ':qa:full-cluster-restart', configuration: 'testArtifacts')
   }
 
   // copy x-pack plugin info so it is on the classpath and security manager has the right permissions

x-pack/qa/rolling-upgrade/build.gradle

@@ -88,18 +88,18 @@ subprojects {
 
   apply plugin: 'elasticsearch.standalone-test'
 
-  // Use resources from the rolling-upgrade project in subdirectories
   sourceSets {
     test {
-      java {
-        srcDirs = ["${mainProject.projectDir}/src/test/java"]
-      }
-      resources {
-        srcDirs = ["${mainProject.projectDir}/src/test/resources"]
+      mainProject.sourceSets.test.output.classesDirs.each { dir ->
+        output.addClassesDir { dir }
       }
+      runtimeClasspath += mainProject.sourceSets.test.output
     }
   }
 
+  // subprojects don't contain source so ignore
+  licenseHeaders.enabled = false
+
   forbiddenPatterns {
     exclude '**/system_key'
   }

x-pack/qa/security-tools-tests/build.gradle

@@ -8,7 +8,9 @@ dependencies {
 }
 
 // add test resources from security, so certificate tool tests can use example certs
-sourceSets.test.resources.srcDirs(project(xpackModule('security')).sourceSets.test.resources.srcDirs)
+processTestResources {
+  from(project(xpackModule('security')).sourceSets.test.resources.srcDirs)
+}
 
 // we have to repeate these patterns because the security test resources are effectively in the src of this project
 forbiddenPatterns {

x-pack/qa/third-party/active-directory/build.gradle

@@ -9,8 +9,11 @@ dependencies {
 testFixtures.useFixture ":x-pack:test:smb-fixture"
 
 // add test resources from security, so tests can use example certs
-sourceSets.test.resources.srcDirs(project(xpackModule('security')).sourceSets.test.resources.srcDirs)
-compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"
+processTestResources {
+  from(project(xpackModule('security')).sourceSets.test.resources.srcDirs) 
+}
+
+compileTestJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked"
 
 // we have to repeat these patterns because the security test resources are effectively in the src of this project
 forbiddenPatterns {

x-pack/qa/tribe-tests-with-license/build.gradle

@@ -34,13 +34,8 @@ unitTest {
   include '**/*Tests.class'
 }
 
-String licensePath = xpackProject('license-tools').projectDir.toPath().resolve('src/test/resources').toString()
-sourceSets {
-  test {
-    resources {
-      srcDirs += [licensePath]
-    }
-  }
+processTestResources {
+    from xpackProject('license-tools').file('src/test/resources')
 }
 
 project.forbiddenPatterns {

x-pack/qa/tribe-tests-with-security/build.gradle

@@ -17,13 +17,8 @@ dependencies {
 
 compileTestJava.options.compilerArgs << "-Xlint:-try"
 
-String xpackPath = project(xpackModule('core')).projectDir.toPath().resolve('src/test/resources').toString()
-sourceSets {
-    test {
-        resources {
-            srcDirs += [xpackPath]
-        }
-    }
+processTestResources {
+    from project(xpackModule('core')).file('src/test/resources')
 }
 
 forbiddenPatterns {