MINOR: Remove some Deadcode in Gradle (#37160)
This commit is contained in:
parent
39a072389c
commit
31c33fdb9b
|
@ -24,13 +24,9 @@ import org.elasticsearch.gradle.Version
|
||||||
import org.elasticsearch.gradle.VersionCollection
|
import org.elasticsearch.gradle.VersionCollection
|
||||||
import org.elasticsearch.gradle.VersionProperties
|
import org.elasticsearch.gradle.VersionProperties
|
||||||
import org.elasticsearch.gradle.plugin.PluginBuildPlugin
|
import org.elasticsearch.gradle.plugin.PluginBuildPlugin
|
||||||
import org.gradle.api.tasks.options.Option
|
import org.gradle.util.GradleVersion
|
||||||
import org.gradle.util.GradleVersion
|
import org.gradle.util.DistributionLocator
|
||||||
import org.gradle.util.DistributionLocator
|
|
||||||
import org.gradle.plugins.ide.eclipse.model.SourceFolder
|
import org.gradle.plugins.ide.eclipse.model.SourceFolder
|
||||||
import com.carrotsearch.gradle.junit4.RandomizedTestingTask
|
|
||||||
|
|
||||||
import java.util.function.Predicate
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.gradle.build-scan' version '2.0.2'
|
id 'com.gradle.build-scan' version '2.0.2'
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
* specific language governing permissions and limitations
|
* specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
import java.nio.file.Files
|
|
||||||
import org.gradle.util.GradleVersion
|
import org.gradle.util.GradleVersion
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
|
|
|
@ -16,9 +16,6 @@
|
||||||
* specific language governing permissions and limitations
|
* specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
import org.elasticsearch.gradle.test.RestIntegTestTask
|
|
||||||
import org.gradle.api.internal.provider.Providers
|
|
||||||
|
|
||||||
apply plugin: 'elasticsearch.build'
|
apply plugin: 'elasticsearch.build'
|
||||||
apply plugin: 'elasticsearch.rest-test'
|
apply plugin: 'elasticsearch.rest-test'
|
||||||
apply plugin: 'nebula.maven-base-publish'
|
apply plugin: 'nebula.maven-base-publish'
|
||||||
|
|
|
@ -26,8 +26,6 @@ import org.apache.tools.ant.filters.FixCrLfFilter
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
|
|
||||||
Collection distributions = project('archives').subprojects + project('packages').subprojects
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* Third party dependencies report *
|
* Third party dependencies report *
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
import org.elasticsearch.gradle.LoggedExec
|
|
||||||
|
|
||||||
esplugin {
|
esplugin {
|
||||||
description 'The Google Compute Engine (GCE) Discovery plugin allows to use GCE API for the unicast discovery mechanism.'
|
description 'The Google Compute Engine (GCE) Discovery plugin allows to use GCE API for the unicast discovery mechanism.'
|
||||||
classname 'org.elasticsearch.plugin.discovery.gce.GceDiscoveryPlugin'
|
classname 'org.elasticsearch.plugin.discovery.gce.GceDiscoveryPlugin'
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
|
|
||||||
|
|
||||||
import org.elasticsearch.gradle.Version
|
import org.elasticsearch.gradle.Version
|
||||||
import org.elasticsearch.gradle.VersionCollection
|
|
||||||
import org.elasticsearch.gradle.test.RestIntegTestTask
|
import org.elasticsearch.gradle.test.RestIntegTestTask
|
||||||
|
|
||||||
apply plugin: 'elasticsearch.standalone-test'
|
apply plugin: 'elasticsearch.standalone-test'
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.util.Locale
|
|
||||||
import org.elasticsearch.gradle.Version
|
import org.elasticsearch.gradle.Version
|
||||||
import org.elasticsearch.gradle.VersionProperties
|
import org.elasticsearch.gradle.VersionProperties
|
||||||
import org.elasticsearch.gradle.test.RestIntegTestTask
|
import org.elasticsearch.gradle.test.RestIntegTestTask
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import org.elasticsearch.gradle.precommit.PrecommitTasks
|
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
// fixtures is just intermediate parent project
|
// fixtures is just intermediate parent project
|
||||||
if (name == 'fixtures') return
|
if (name == 'fixtures') return
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
import org.elasticsearch.gradle.BuildPlugin
|
|
||||||
import org.elasticsearch.gradle.plugin.PluginBuildPlugin
|
import org.elasticsearch.gradle.plugin.PluginBuildPlugin
|
||||||
import org.elasticsearch.gradle.Version
|
|
||||||
import org.elasticsearch.gradle.precommit.LicenseHeadersTask
|
import org.elasticsearch.gradle.precommit.LicenseHeadersTask
|
||||||
|
|
||||||
Project xpackRootProject = project
|
Project xpackRootProject = project
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
import org.elasticsearch.gradle.MavenFilteringHack
|
import org.elasticsearch.gradle.MavenFilteringHack
|
||||||
|
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.Path
|
|
||||||
import java.nio.file.Paths
|
import java.nio.file.Paths
|
||||||
import java.nio.file.StandardCopyOption
|
|
||||||
import com.carrotsearch.gradle.junit4.RandomizedTestingTask;
|
import com.carrotsearch.gradle.junit4.RandomizedTestingTask;
|
||||||
|
|
||||||
apply plugin: 'elasticsearch.esplugin'
|
apply plugin: 'elasticsearch.esplugin'
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
import java.net.HttpURLConnection
|
|
||||||
import org.elasticsearch.gradle.VersionProperties
|
import org.elasticsearch.gradle.VersionProperties
|
||||||
|
|
||||||
apply plugin: 'distribution'
|
apply plugin: 'distribution'
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
import org.elasticsearch.gradle.LoggedExec
|
|
||||||
|
|
||||||
apply plugin: 'elasticsearch.standalone-rest-test'
|
apply plugin: 'elasticsearch.standalone-rest-test'
|
||||||
apply plugin: 'elasticsearch.rest-test'
|
apply plugin: 'elasticsearch.rest-test'
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This project is named sql-cli because it is in the "org.elasticsearch.plugin"
|
* This project is named sql-cli because it is in the "org.elasticsearch.plugin"
|
||||||
* group and it'd be super confusing for it to just be called "cli" there.
|
* group and it'd be super confusing for it to just be called "cli" there.
|
||||||
|
|
|
@ -3,7 +3,6 @@ import org.elasticsearch.gradle.test.RestIntegTestTask
|
||||||
import org.elasticsearch.gradle.Version
|
import org.elasticsearch.gradle.Version
|
||||||
|
|
||||||
import java.nio.charset.StandardCharsets
|
import java.nio.charset.StandardCharsets
|
||||||
import java.nio.file.Paths
|
|
||||||
import java.util.regex.Matcher
|
import java.util.regex.Matcher
|
||||||
|
|
||||||
// Apply the java plugin to this project so the sources can be edited in an IDE
|
// Apply the java plugin to this project so the sources can be edited in an IDE
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
import org.elasticsearch.gradle.LoggedExec
|
|
||||||
import org.elasticsearch.gradle.MavenFilteringHack
|
import org.elasticsearch.gradle.MavenFilteringHack
|
||||||
import org.elasticsearch.gradle.plugin.PluginBuildPlugin
|
|
||||||
import org.elasticsearch.gradle.test.NodeInfo
|
import org.elasticsearch.gradle.test.NodeInfo
|
||||||
|
|
||||||
import javax.net.ssl.HttpsURLConnection
|
import javax.net.ssl.HttpsURLConnection
|
||||||
|
|
|
@ -1,8 +1,3 @@
|
||||||
import groovy.json.JsonSlurper
|
|
||||||
|
|
||||||
import javax.net.ssl.HttpsURLConnection
|
|
||||||
import java.nio.charset.StandardCharsets
|
|
||||||
|
|
||||||
apply plugin: 'elasticsearch.standalone-rest-test'
|
apply plugin: 'elasticsearch.standalone-rest-test'
|
||||||
apply plugin: 'elasticsearch.rest-test'
|
apply plugin: 'elasticsearch.rest-test'
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
import org.elasticsearch.gradle.LoggedExec
|
|
||||||
|
|
||||||
apply plugin: 'elasticsearch.standalone-rest-test'
|
apply plugin: 'elasticsearch.standalone-rest-test'
|
||||||
apply plugin: 'elasticsearch.rest-test'
|
apply plugin: 'elasticsearch.rest-test'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
import org.elasticsearch.gradle.test.NodeInfo
|
|
||||||
import org.elasticsearch.gradle.LoggedExec
|
|
||||||
|
|
||||||
apply plugin: 'elasticsearch.standalone-rest-test'
|
apply plugin: 'elasticsearch.standalone-rest-test'
|
||||||
apply plugin: 'elasticsearch.rest-test'
|
apply plugin: 'elasticsearch.rest-test'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue