From 197ed57ea49cbf453160233db2a16bf35f8b4756 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Fri, 30 Oct 2015 13:22:59 -0700 Subject: [PATCH] Build: Move RR gradle plugin files to match external repo paths The RR gradle plugin is at https://github.com/randomizedtesting/gradle-randomized-testing-plugin. However, we currently have a copy of this, since the plugin is still in heavy development. This change moves the files around so they can be copied directly from the elasticsearch fork to that repo, for ease of syncing. --- .../BalancersConfiguration.groovy | 2 +- .../ListenersConfiguration.groovy | 2 +- .../{randomizedtesting => junit4}/LoggingOutputStream.groovy | 2 +- .../RandomizedTestingPlugin.groovy | 2 +- .../RandomizedTestingTask.groovy | 2 +- .../SlowTestsConfiguration.groovy | 2 +- .../StackTraceFiltersConfiguration.groovy | 2 +- .../TestLoggingConfiguration.groovy | 2 +- .../{randomizedtesting => junit4}/TestProgressLogger.groovy | 2 +- .../{randomizedtesting => junit4}/TestReportLogger.groovy | 4 ++-- .../main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy | 2 +- .../org/elasticsearch/gradle/test/RestIntegTestTask.groovy | 2 +- .../org/elasticsearch/gradle/test/RestTestPlugin.groovy | 4 ++-- .../gradle-plugins/carrotsearch.randomized-testing.properties | 1 + .../gradle-plugins/carrotsearch.randomizedtesting.properties | 1 - core/build.gradle | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) rename buildSrc/src/main/groovy/com/carrotsearch/gradle/{randomizedtesting => junit4}/BalancersConfiguration.groovy (97%) rename buildSrc/src/main/groovy/com/carrotsearch/gradle/{randomizedtesting => junit4}/ListenersConfiguration.groovy (94%) rename buildSrc/src/main/groovy/com/carrotsearch/gradle/{randomizedtesting => junit4}/LoggingOutputStream.groovy (97%) rename buildSrc/src/main/groovy/com/carrotsearch/gradle/{randomizedtesting => junit4}/RandomizedTestingPlugin.groovy (96%) rename buildSrc/src/main/groovy/com/carrotsearch/gradle/{randomizedtesting => junit4}/RandomizedTestingTask.groovy (99%) rename buildSrc/src/main/groovy/com/carrotsearch/gradle/{randomizedtesting => junit4}/SlowTestsConfiguration.groovy (82%) rename buildSrc/src/main/groovy/com/carrotsearch/gradle/{randomizedtesting => junit4}/StackTraceFiltersConfiguration.groovy (84%) rename buildSrc/src/main/groovy/com/carrotsearch/gradle/{randomizedtesting => junit4}/TestLoggingConfiguration.groovy (95%) rename buildSrc/src/main/groovy/com/carrotsearch/gradle/{randomizedtesting => junit4}/TestProgressLogger.groovy (98%) rename buildSrc/src/main/groovy/com/carrotsearch/gradle/{randomizedtesting => junit4}/TestReportLogger.groovy (98%) create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/carrotsearch.randomized-testing.properties delete mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/carrotsearch.randomizedtesting.properties diff --git a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/BalancersConfiguration.groovy b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/BalancersConfiguration.groovy similarity index 97% rename from buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/BalancersConfiguration.groovy rename to buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/BalancersConfiguration.groovy index 2f92d58a78e..91355bf2494 100644 --- a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/BalancersConfiguration.groovy +++ b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/BalancersConfiguration.groovy @@ -1,4 +1,4 @@ -package com.carrotsearch.gradle.randomizedtesting +package com.carrotsearch.gradle.junit4 import com.carrotsearch.ant.tasks.junit4.SuiteBalancer import com.carrotsearch.ant.tasks.junit4.balancers.ExecutionTimeBalancer diff --git a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/ListenersConfiguration.groovy b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/ListenersConfiguration.groovy similarity index 94% rename from buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/ListenersConfiguration.groovy rename to buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/ListenersConfiguration.groovy index 634a68e37f4..5fa5baa8ffb 100644 --- a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/ListenersConfiguration.groovy +++ b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/ListenersConfiguration.groovy @@ -1,4 +1,4 @@ -package com.carrotsearch.gradle.randomizedtesting +package com.carrotsearch.gradle.junit4 import com.carrotsearch.ant.tasks.junit4.listeners.AggregatedEventListener import com.carrotsearch.ant.tasks.junit4.listeners.antxml.AntXmlReport diff --git a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/LoggingOutputStream.groovy b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/LoggingOutputStream.groovy similarity index 97% rename from buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/LoggingOutputStream.groovy rename to buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/LoggingOutputStream.groovy index bf19d43824f..ce0995a5a8c 100644 --- a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/LoggingOutputStream.groovy +++ b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/LoggingOutputStream.groovy @@ -1,4 +1,4 @@ -package com.carrotsearch.gradle.randomizedtesting +package com.carrotsearch.gradle.junit4 import org.gradle.api.logging.LogLevel import org.gradle.api.logging.Logger diff --git a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/RandomizedTestingPlugin.groovy b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/RandomizedTestingPlugin.groovy similarity index 96% rename from buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/RandomizedTestingPlugin.groovy rename to buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/RandomizedTestingPlugin.groovy index f7b677704c0..e2230b116c7 100644 --- a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/RandomizedTestingPlugin.groovy +++ b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/RandomizedTestingPlugin.groovy @@ -1,4 +1,4 @@ -package com.carrotsearch.gradle.randomizedtesting +package com.carrotsearch.gradle.junit4 import com.carrotsearch.ant.tasks.junit4.JUnit4 import org.gradle.api.AntBuilder diff --git a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/RandomizedTestingTask.groovy b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/RandomizedTestingTask.groovy similarity index 99% rename from buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/RandomizedTestingTask.groovy rename to buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/RandomizedTestingTask.groovy index 9ce9f51fd50..723f67f0298 100644 --- a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/RandomizedTestingTask.groovy +++ b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/RandomizedTestingTask.groovy @@ -1,4 +1,4 @@ -package com.carrotsearch.gradle.randomizedtesting +package com.carrotsearch.gradle.junit4 import com.carrotsearch.ant.tasks.junit4.ListenersList import com.carrotsearch.ant.tasks.junit4.listeners.AggregatedEventListener diff --git a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/SlowTestsConfiguration.groovy b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/SlowTestsConfiguration.groovy similarity index 82% rename from buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/SlowTestsConfiguration.groovy rename to buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/SlowTestsConfiguration.groovy index 00c4493a39b..2705fdeaacb 100644 --- a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/SlowTestsConfiguration.groovy +++ b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/SlowTestsConfiguration.groovy @@ -1,4 +1,4 @@ -package com.carrotsearch.gradle.randomizedtesting +package com.carrotsearch.gradle.junit4 class SlowTestsConfiguration { int heartbeat = 0 diff --git a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/StackTraceFiltersConfiguration.groovy b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/StackTraceFiltersConfiguration.groovy similarity index 84% rename from buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/StackTraceFiltersConfiguration.groovy rename to buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/StackTraceFiltersConfiguration.groovy index 7450a5a9f62..5e5610ab68e 100644 --- a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/StackTraceFiltersConfiguration.groovy +++ b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/StackTraceFiltersConfiguration.groovy @@ -1,4 +1,4 @@ -package com.carrotsearch.gradle.randomizedtesting +package com.carrotsearch.gradle.junit4 class StackTraceFiltersConfiguration { List patterns = new ArrayList<>() diff --git a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/TestLoggingConfiguration.groovy b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestLoggingConfiguration.groovy similarity index 95% rename from buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/TestLoggingConfiguration.groovy rename to buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestLoggingConfiguration.groovy index d844893cbda..d18ac3fbd5a 100644 --- a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/TestLoggingConfiguration.groovy +++ b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestLoggingConfiguration.groovy @@ -1,4 +1,4 @@ -package com.carrotsearch.gradle.randomizedtesting +package com.carrotsearch.gradle.junit4 import org.gradle.util.ConfigureUtil diff --git a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/TestProgressLogger.groovy b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestProgressLogger.groovy similarity index 98% rename from buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/TestProgressLogger.groovy rename to buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestProgressLogger.groovy index 7321ef53d1c..1a8884f3d29 100644 --- a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/TestProgressLogger.groovy +++ b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestProgressLogger.groovy @@ -17,7 +17,7 @@ * under the License. */ -package com.carrotsearch.gradle.randomizedtesting +package com.carrotsearch.gradle.junit4 import com.carrotsearch.ant.tasks.junit4.JUnit4 import com.carrotsearch.ant.tasks.junit4.dependencies.com.google.common.eventbus.Subscribe diff --git a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/TestReportLogger.groovy b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestReportLogger.groovy similarity index 98% rename from buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/TestReportLogger.groovy rename to buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestReportLogger.groovy index c4c253bc734..36d83a19865 100644 --- a/buildSrc/src/main/groovy/com/carrotsearch/gradle/randomizedtesting/TestReportLogger.groovy +++ b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestReportLogger.groovy @@ -1,4 +1,4 @@ -package com.carrotsearch.gradle.randomizedtesting +package com.carrotsearch.gradle.junit4 import com.carrotsearch.ant.tasks.junit4.JUnit4 import com.carrotsearch.ant.tasks.junit4.Pluralize @@ -18,7 +18,7 @@ import org.junit.runner.Description import java.util.concurrent.atomic.AtomicInteger import static com.carrotsearch.ant.tasks.junit4.FormattingUtils.* -import static com.carrotsearch.gradle.randomizedtesting.TestLoggingConfiguration.OutputMode +import static com.carrotsearch.gradle.junit4.TestLoggingConfiguration.OutputMode class TestReportLogger extends TestsSummaryEventListener implements AggregatedEventListener { diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy index 2b7aaa9cc0b..6ed1553dceb 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy @@ -37,7 +37,7 @@ class BuildPlugin implements Plugin { void apply(Project project) { globalBuildInfo(project) project.pluginManager.apply('java') - project.pluginManager.apply('carrotsearch.randomizedtesting') + project.pluginManager.apply('carrotsearch.randomized-testing') // these plugins add lots of info to our jars project.pluginManager.apply('nebula.info-broker') project.pluginManager.apply('nebula.info-basic') diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestIntegTestTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestIntegTestTask.groovy index 80fe6556a85..262826a5c23 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestIntegTestTask.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestIntegTestTask.groovy @@ -18,7 +18,7 @@ */ package org.elasticsearch.gradle.test -import com.carrotsearch.gradle.randomizedtesting.RandomizedTestingTask +import com.carrotsearch.gradle.junit4.RandomizedTestingTask import org.elasticsearch.gradle.BuildPlugin import org.gradle.api.Project import org.gradle.api.Task diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestTestPlugin.groovy index c8411c80f98..24e21160331 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestTestPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestTestPlugin.groovy @@ -18,7 +18,7 @@ */ package org.elasticsearch.gradle.test -import com.carrotsearch.gradle.randomizedtesting.RandomizedTestingTask +import com.carrotsearch.gradle.junit4.RandomizedTestingTask import org.elasticsearch.gradle.ElasticsearchProperties import org.gradle.api.Plugin import org.gradle.api.Project @@ -29,7 +29,7 @@ class RestTestPlugin implements Plugin { @Override void apply(Project project) { project.pluginManager.apply('java-base') - project.pluginManager.apply('carrotsearch.randomizedtesting') + project.pluginManager.apply('carrotsearch.randomized-testing') project.pluginManager.apply('idea') // remove some unnecessary tasks for a qa test diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/carrotsearch.randomized-testing.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/carrotsearch.randomized-testing.properties new file mode 100644 index 00000000000..e1a1b8297c8 --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/carrotsearch.randomized-testing.properties @@ -0,0 +1 @@ +implementation-class=com.carrotsearch.gradle.junit4.RandomizedTestingPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/carrotsearch.randomizedtesting.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/carrotsearch.randomizedtesting.properties deleted file mode 100644 index 5e0627f688e..00000000000 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/carrotsearch.randomizedtesting.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=com.carrotsearch.gradle.randomizedtesting.RandomizedTestingPlugin diff --git a/core/build.gradle b/core/build.gradle index 3bc0168e077..01134f372bd 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -17,7 +17,7 @@ * under the License. */ -import com.carrotsearch.gradle.randomizedtesting.RandomizedTestingTask +import com.carrotsearch.gradle.junit4.RandomizedTestingTask import org.elasticsearch.gradle.BuildPlugin import org.elasticsearch.gradle.test.RestSpecHack