Use TestArtifact plugin instead of custom test jar tasks (elastic#75931)

Make use of test artifact plugin and avoid using custom test jars created manually. Co-authored-by: Elastic Machine <[email protected]>
original-brownbear · Aug 4, 2021 · 2d7d3bd · 2d7d3bd
1 parent e87f05d
commit 2d7d3bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
diff --git a/x-pack/plugin/sql/qa/jdbc/security/build.gradle b/x-pack/plugin/sql/qa/jdbc/security/build.gradle
@@ -1,29 +1,20 @@
 import org.elasticsearch.gradle.internal.test.RestIntegTestTask
 
+apply plugin: 'elasticsearch.internal-test-artifact'
+
 dependencies {
   testImplementation project(':x-pack:plugin:core')
 }
 
 Project mainProject = project
 
-configurations.create('testArtifacts')
-
-TaskProvider testJar = tasks.register("testJar", Jar) {
-  appendix 'test'
-  from sourceSets.test.output
-}
-
-artifacts {
-  testArtifacts testJar
-}
-
 subprojects {
   // Use tests from the root security qa project in subprojects
-  configurations.create('testArtifacts')
+  configurations.create('testArtifacts').transitive(false)
 
   dependencies {
     testImplementation project(":x-pack:plugin:core")
-    testArtifacts project(path: mainProject.path, configuration: 'testArtifacts')
+    testArtifacts testArtifact(project(mainProject.path))
   }
 
   testClusters.all {

diff --git a/x-pack/plugin/sql/qa/server/security/build.gradle b/x-pack/plugin/sql/qa/server/security/build.gradle
@@ -1,30 +1,21 @@
+apply plugin: 'elasticsearch.internal-test-artifact'
+
 dependencies {
   testImplementation project(':x-pack:plugin:core')
 }
 
 Project mainProject = project
 
-configurations.create('testArtifacts')
-
-TaskProvider testJar = tasks.register("testJar", Jar) {
-  appendix 'test'
-  from sourceSets.test.output
-}
-
-artifacts {
-  testArtifacts testJar
-}
-
 // Tests are pushed down to subprojects and will be checked there.
 tasks.named("testingConventions").configure { enabled = false }
 
 subprojects {
   // Use tests from the root security qa project in subprojects
-  configurations.create('testArtifacts')
+  configurations.create('testArtifacts').transitive(false)
 
   dependencies {
     testImplementation project(":x-pack:plugin:core")
-    testArtifacts project(path: mainProject.path, configuration: 'testArtifacts')
+    testArtifacts testArtifact(project(mainProject.path))
   }
 
   testClusters.matching { it.name == "integTest" }.configureEach {