mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-06 04:58:50 +00:00
70cfedf542
This commit removes the configuration time vs execution time distinction with regards to certain BuildParms properties. Because of the cost of determining Java versions for configuration JDK locations we deferred this until execution time. This had two main downsides. First, we had to implement all this build logic in tasks, which required a bunch of additional plumbing and complexity. Second, because some information wasn't known during configuration time, we had to nest any build logic that depended on this in awkward callbacks. We now defer to the JavaInstallationRegistry recently added in Gradle. This utility uses a much more efficient method for probing Java installations vs our jrunscript implementation. This, combined with some optimizations to avoid probing the current JVM as well as deferring some evaluation via Providers when probing installations for BWC builds we can maintain effectively the same configuration time performance while removing a bunch of complexity and runtime cost (snapshotting inputs for the GenerateGlobalBuildInfoTask was very expensive). The end result should be a much more responsive build execution in almost all scenarios. (cherry picked from commit ecdbd37f2e0f0447ed574b306adb64c19adc3ce1)
126 lines
4.2 KiB
Groovy
126 lines
4.2 KiB
Groovy
import org.elasticsearch.gradle.info.BuildParams
|
|
|
|
/*
|
|
* Licensed to Elasticsearch under one or more contributor
|
|
* license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright
|
|
* ownership. Elasticsearch licenses this file to you under
|
|
* the Apache License, Version 2.0 (the "License"); you may
|
|
* not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing,
|
|
* software distributed under the License is distributed on an
|
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
* KIND, either express or implied. See the License for the
|
|
* specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
|
|
esplugin {
|
|
description 'The EC2 discovery plugin allows to use AWS API for the unicast discovery mechanism.'
|
|
classname 'org.elasticsearch.discovery.ec2.Ec2DiscoveryPlugin'
|
|
}
|
|
|
|
versions << [
|
|
'aws': '1.11.749'
|
|
]
|
|
|
|
dependencies {
|
|
compile "com.amazonaws:aws-java-sdk-ec2:${versions.aws}"
|
|
compile "com.amazonaws:aws-java-sdk-core:${versions.aws}"
|
|
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
|
|
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
|
|
compile "commons-logging:commons-logging:${versions.commonslogging}"
|
|
compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
|
|
compile "commons-codec:commons-codec:${versions.commonscodec}"
|
|
compile "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
|
|
compile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
|
|
}
|
|
|
|
restResources {
|
|
restApi {
|
|
includeCore '_common', 'cluster', 'nodes'
|
|
}
|
|
}
|
|
|
|
dependencyLicenses {
|
|
mapping from: /aws-java-sdk-.*/, to: 'aws-java-sdk'
|
|
mapping from: /jackson-.*/, to: 'jackson'
|
|
}
|
|
|
|
bundlePlugin {
|
|
from('config/discovery-ec2') {
|
|
into 'config'
|
|
}
|
|
}
|
|
|
|
task writeTestJavaPolicy {
|
|
doLast {
|
|
final File tmp = file("${buildDir}/tmp")
|
|
if (tmp.exists() == false && tmp.mkdirs() == false) {
|
|
throw new GradleException("failed to create temporary directory [${tmp}]")
|
|
}
|
|
final File javaPolicy = file("${tmp}/java.policy")
|
|
javaPolicy.write(
|
|
[
|
|
"grant {",
|
|
" permission java.util.PropertyPermission \"com.amazonaws.sdk.ec2MetadataServiceEndpointOverride\", \"write\";",
|
|
"};"
|
|
].join("\n"))
|
|
}
|
|
}
|
|
|
|
test {
|
|
dependsOn writeTestJavaPolicy
|
|
// this is needed for insecure plugins, remove if possible!
|
|
systemProperty 'tests.artifact', project.name
|
|
|
|
// this is needed to manipulate com.amazonaws.sdk.ec2MetadataServiceEndpointOverride system property
|
|
// it is better rather disable security manager at all with `systemProperty 'tests.security.manager', 'false'`
|
|
systemProperty 'java.security.policy', "file://${buildDir}/tmp/java.policy"
|
|
}
|
|
|
|
check {
|
|
// also execute the QA tests when testing the plugin
|
|
dependsOn 'qa:amazon-ec2:check'
|
|
}
|
|
|
|
thirdPartyAudit.ignoreMissingClasses(
|
|
// classes are missing
|
|
'com.amazonaws.jmespath.JmesPathEvaluationVisitor',
|
|
'com.amazonaws.jmespath.JmesPathExpression',
|
|
'com.amazonaws.jmespath.JmesPathField',
|
|
'com.amazonaws.jmespath.JmesPathFlatten',
|
|
'com.amazonaws.jmespath.JmesPathIdentity',
|
|
'com.amazonaws.jmespath.JmesPathLengthFunction',
|
|
'com.amazonaws.jmespath.JmesPathLiteral',
|
|
'com.amazonaws.jmespath.JmesPathProjection',
|
|
'com.amazonaws.jmespath.JmesPathSubExpression',
|
|
'com.amazonaws.jmespath.ObjectMapperSingleton',
|
|
'com.amazonaws.jmespath.OpGreaterThan',
|
|
'software.amazon.ion.IonReader',
|
|
'software.amazon.ion.IonSystem',
|
|
'software.amazon.ion.IonType',
|
|
'software.amazon.ion.IonWriter',
|
|
'software.amazon.ion.Timestamp',
|
|
'software.amazon.ion.system.IonBinaryWriterBuilder',
|
|
'software.amazon.ion.system.IonSystemBuilder',
|
|
'software.amazon.ion.system.IonTextWriterBuilder',
|
|
'software.amazon.ion.system.IonWriterBuilder',
|
|
'javax.servlet.ServletContextEvent',
|
|
'javax.servlet.ServletContextListener',
|
|
'org.apache.avalon.framework.logger.Logger',
|
|
'org.apache.log.Hierarchy',
|
|
'org.apache.log.Logger'
|
|
)
|
|
|
|
if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_1_8) {
|
|
thirdPartyAudit.ignoreMissingClasses(
|
|
'javax.xml.bind.DatatypeConverter',
|
|
'javax.xml.bind.JAXBContext'
|
|
)
|
|
}
|