Force evaluation order between sub-plugins and core
We are relying on the fact that :x-pack-elasticsearch:plugin:core is configured before these. This happens when these projects are alphabetically after core, but is not the case when they are not (ccr). To address this, we simplfy be explicit about evaluation order in all sub-plugins. Relates elastic/x-pack-elasticsearch#3663 Original commit: elastic/x-pack-elasticsearch@755f84258b
This commit is contained in:
parent
520b372549
commit
2453da82e0
|
@ -1,3 +1,5 @@
|
|||
evaluationDependsOn(':x-pack-elasticsearch:plugin:core')
|
||||
|
||||
apply plugin: 'elasticsearch.esplugin'
|
||||
esplugin {
|
||||
name 'x-pack-deprecation'
|
||||
|
@ -11,7 +13,6 @@ esplugin {
|
|||
}
|
||||
archivesBaseName = 'x-pack-deprecation'
|
||||
|
||||
// TODO: enable this once we have tests
|
||||
licenseHeaders.enabled = false
|
||||
|
||||
integTest.enabled = false
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
evaluationDependsOn(':x-pack-elasticsearch:plugin:core')
|
||||
|
||||
apply plugin: 'elasticsearch.esplugin'
|
||||
esplugin {
|
||||
name 'x-pack-graph'
|
||||
|
@ -11,7 +13,6 @@ esplugin {
|
|||
}
|
||||
archivesBaseName = 'x-pack-graph'
|
||||
|
||||
// TODO: enable this once we have tests
|
||||
licenseHeaders.enabled = false
|
||||
|
||||
integTest.enabled = false
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
evaluationDependsOn(':x-pack-elasticsearch:plugin:core')
|
||||
|
||||
apply plugin: 'elasticsearch.esplugin'
|
||||
esplugin {
|
||||
name 'x-pack-logstash'
|
||||
|
@ -11,7 +13,6 @@ esplugin {
|
|||
}
|
||||
archivesBaseName = 'x-pack-logstash'
|
||||
|
||||
// TODO: enable this once we have tests
|
||||
licenseHeaders.enabled = false
|
||||
|
||||
integTest.enabled = false
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
evaluationDependsOn(':x-pack-elasticsearch:plugin:core')
|
||||
|
||||
apply plugin: 'elasticsearch.esplugin'
|
||||
esplugin {
|
||||
name 'x-pack-ml'
|
||||
|
@ -11,7 +13,6 @@ esplugin {
|
|||
}
|
||||
archivesBaseName = 'x-pack-ml'
|
||||
|
||||
// TODO: enable this once we have tests
|
||||
licenseHeaders.enabled = false
|
||||
|
||||
integTest.enabled = false
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
evaluationDependsOn(':x-pack-elasticsearch:plugin:core')
|
||||
|
||||
apply plugin: 'elasticsearch.esplugin'
|
||||
esplugin {
|
||||
name 'x-pack-monitoring'
|
||||
|
@ -11,7 +13,6 @@ esplugin {
|
|||
}
|
||||
archivesBaseName = 'x-pack-monitoring'
|
||||
|
||||
// TODO: enable this once we have tests
|
||||
licenseHeaders.enabled = false
|
||||
|
||||
integTest.enabled = false
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
evaluationDependsOn(':x-pack-elasticsearch:plugin:core')
|
||||
|
||||
apply plugin: 'elasticsearch.esplugin'
|
||||
esplugin {
|
||||
name 'x-pack-security'
|
||||
|
@ -12,7 +14,6 @@ esplugin {
|
|||
|
||||
archivesBaseName = 'x-pack-security'
|
||||
|
||||
// TODO: enable this once we have tests
|
||||
licenseHeaders.enabled = false
|
||||
|
||||
integTest.enabled = false
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
evaluationDependsOn(':x-pack-elasticsearch:plugin:core')
|
||||
|
||||
apply plugin: 'elasticsearch.esplugin'
|
||||
esplugin {
|
||||
name 'x-pack-upgrade'
|
||||
|
@ -11,7 +13,6 @@ esplugin {
|
|||
}
|
||||
|
||||
archivesBaseName = 'x-pack-upgrade'
|
||||
// TODO: enable this once we have tests
|
||||
test.enabled=false
|
||||
licenseHeaders.enabled = false
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import org.elasticsearch.gradle.test.RunTask
|
||||
evaluationDependsOn(':x-pack-elasticsearch:plugin:core')
|
||||
|
||||
apply plugin: 'elasticsearch.esplugin'
|
||||
esplugin {
|
||||
|
@ -14,7 +14,6 @@ esplugin {
|
|||
|
||||
archivesBaseName = 'x-pack-watcher'
|
||||
|
||||
// TODO: enable this once we have tests
|
||||
licenseHeaders.enabled = false
|
||||
|
||||
integTest.enabled = false
|
||||
|
|
Loading…
Reference in New Issue