Cleanup build script to exclude security-authorization-engine (#8) (#8)

* Cleanup build-scan, remove publish scan to elastic server

* Cleanup build script to exclude security-authorization-engine which test has dependency on xpack

* Cleanup build script to exclude security-authorization-engine which test has dependency on xpack

Co-authored-by: Huan Jiang <huanji@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
This commit is contained in:
Nick Knize 2021-01-29 23:53:04 -06:00 committed by Peter Nied
parent 3a52e9ddc1
commit a0b91cb230
3 changed files with 29 additions and 37 deletions

View File

@ -60,7 +60,6 @@ def projectPathsToExclude = [
':example-plugins:rescore', ':example-plugins:rescore',
':example-plugins:rest-handler', ':example-plugins:rest-handler',
':example-plugins:script-expert-scoring', ':example-plugins:script-expert-scoring',
':example-plugins:security-authorization-engine',
':libs:elasticsearch-cli', ':libs:elasticsearch-cli',
':libs:elasticsearch-core', ':libs:elasticsearch-core',
':libs:elasticsearch-dissect', ':libs:elasticsearch-dissect',

View File

@ -26,10 +26,3 @@ configure(project('painless-whitelist')) {
} }
} }
configure(project('security-authorization-engine')) {
configurations.all {
resolutionStrategy.dependencySubstitution {
substitute module('org.elasticsearch.test:logger-usage') with project(':test:logger-usage')
}
}
}

View File

@ -1,35 +1,35 @@
apply plugin: 'elasticsearch.esplugin' // apply plugin: 'elasticsearch.esplugin'
apply plugin: 'elasticsearch.java-rest-test' // apply plugin: 'elasticsearch.java-rest-test'
esplugin { // esplugin {
name 'security-authorization-engine' // name 'security-authorization-engine'
description 'An example spi extension plugin for security that implements an Authorization Engine' // description 'An example spi extension plugin for security that implements an Authorization Engine'
classname 'org.elasticsearch.example.AuthorizationEnginePlugin' // classname 'org.elasticsearch.example.AuthorizationEnginePlugin'
licenseFile rootProject.file('licenses/APACHE-LICENSE-2.0.txt') // licenseFile rootProject.file('licenses/APACHE-LICENSE-2.0.txt')
noticeFile rootProject.file('NOTICE.txt') // noticeFile rootProject.file('NOTICE.txt')
} // }
dependencies { // dependencies {
// let the javaRestTest see the classpath of main // // let the javaRestTest see the classpath of main
javaRestTestImplementation project.sourceSets.main.runtimeClasspath // javaRestTestImplementation project.sourceSets.main.runtimeClasspath
} // }
//no unit tests // //no unit tests
test.enabled = false // test.enabled = false
javaRestTest { // javaRestTest {
dependsOn buildZip // dependsOn buildZip
systemProperty 'tests.security.manager', 'false' // systemProperty 'tests.security.manager', 'false'
} // }
testClusters.javaRestTest { // testClusters.javaRestTest {
setting 'xpack.security.enabled', 'true' // setting 'xpack.security.enabled', 'true'
setting 'xpack.ml.enabled', 'false' // setting 'xpack.ml.enabled', 'false'
setting 'xpack.license.self_generated.type', 'trial' // setting 'xpack.license.self_generated.type', 'trial'
// This is important, so that all the modules are available too. // // This is important, so that all the modules are available too.
// There are index templates that use token filters that are in analysis-module and // // There are index templates that use token filters that are in analysis-module and
// processors are being used that are in ingest-common module. // // processors are being used that are in ingest-common module.
testDistribution = 'DEFAULT' // testDistribution = 'DEFAULT'
user role: 'custom_superuser' // user role: 'custom_superuser'
} // }