Update Gradle Wrapper to 8.2 (#96686)
- Convention usage has been deprecated and was fixed in our build files - Fix test dependencies and deprecation
This commit is contained in:
parent
1f490007a4
commit
b8627079b4
|
@ -10,10 +10,15 @@ import org.elasticsearch.gradle.internal.info.BuildParams
|
|||
|
||||
apply plugin: 'elasticsearch.java'
|
||||
apply plugin: 'application'
|
||||
mainClassName = 'org.openjdk.jmh.Main'
|
||||
|
||||
application {
|
||||
mainClass = 'org.openjdk.jmh.Main'
|
||||
}
|
||||
|
||||
tasks.named("assemble").configure { enabled = false }
|
||||
archivesBaseName = 'elasticsearch-benchmarks'
|
||||
base {
|
||||
archivesName = 'elasticsearch-benchmarks'
|
||||
}
|
||||
|
||||
tasks.named("test").configure { enabled = false }
|
||||
|
||||
|
|
|
@ -17,8 +17,10 @@ plugins {
|
|||
group = "org.elasticsearch"
|
||||
|
||||
// This project contains Checkstyle rule implementations used by IDEs which use a Java 11 runtime
|
||||
targetCompatibility = 11
|
||||
sourceCompatibility = 11
|
||||
java {
|
||||
targetCompatibility = 11
|
||||
sourceCompatibility = 11
|
||||
}
|
||||
|
||||
gradlePlugin {
|
||||
// We already configure publication and we don't need or want the one that comes
|
||||
|
|
|
@ -199,8 +199,10 @@ gradlePlugin {
|
|||
*****************************************************************************/
|
||||
|
||||
def minCompilerJava = versions.get("minimumCompilerJava")
|
||||
targetCompatibility = minCompilerJava
|
||||
sourceCompatibility = minCompilerJava
|
||||
java {
|
||||
targetCompatibility = minCompilerJava
|
||||
sourceCompatibility = minCompilerJava
|
||||
}
|
||||
|
||||
if (JavaVersion.current() < JavaVersion.toVersion(minCompilerJava)) {
|
||||
throw new GradleException("Java ${minCompilerJava} is required to build Elasticsearch but current Java is version ${JavaVersion.current()}.")
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionSha256Sum=5625a0ae20fe000d9225d000b36909c7a0e0e8dda61c19b12da769add847c975
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
|
||||
distributionSha256Sum=5022b0b25fe182b0e50867e77f484501dba44feeea88f5c1f13b6b4660463640
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
@ -26,6 +26,7 @@ import org.gradle.api.provider.Property;
|
|||
import org.gradle.api.provider.Provider;
|
||||
import org.gradle.api.provider.ProviderFactory;
|
||||
import org.gradle.internal.jvm.Jvm;
|
||||
import org.gradle.internal.jvm.inspection.JavaInstallationRegistry;
|
||||
import org.gradle.internal.jvm.inspection.JvmInstallationMetadata;
|
||||
import org.gradle.internal.jvm.inspection.JvmMetadataDetector;
|
||||
import org.gradle.internal.jvm.inspection.JvmVendor;
|
||||
|
@ -35,7 +36,6 @@ import org.gradle.jvm.toolchain.JavaToolchainService;
|
|||
import org.gradle.jvm.toolchain.JavaToolchainSpec;
|
||||
import org.gradle.jvm.toolchain.JvmVendorSpec;
|
||||
import org.gradle.jvm.toolchain.internal.InstallationLocation;
|
||||
import org.gradle.jvm.toolchain.internal.JavaInstallationRegistry;
|
||||
import org.gradle.util.GradleVersion;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
|
@ -257,7 +257,7 @@ public class GlobalBuildInfoPlugin implements Plugin<Project> {
|
|||
|
||||
private Stream<InstallationLocation> getAvailableJavaInstallationLocationSteam() {
|
||||
return Stream.concat(
|
||||
javaInstallationRegistry.listInstallations().stream(),
|
||||
javaInstallationRegistry.toolchains().stream().map(metadata -> metadata.location),
|
||||
Stream.of(new InstallationLocation(Jvm.current().getJavaHome(), "Current JVM"))
|
||||
);
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
8.1.1
|
||||
8.2
|
|
@ -21,8 +21,11 @@ description = "The elasticsearch build tools"
|
|||
|
||||
group = "org.elasticsearch.gradle"
|
||||
version = versions.getProperty("elasticsearch")
|
||||
targetCompatibility = versions.get("minimumRuntimeJava")
|
||||
sourceCompatibility = versions.get("minimumRuntimeJava")
|
||||
|
||||
java {
|
||||
targetCompatibility = versions.get("minimumRuntimeJava")
|
||||
sourceCompatibility = versions.get("minimumRuntimeJava")
|
||||
}
|
||||
|
||||
gradlePlugin {
|
||||
// We already configure publication and we don't need or want the one that comes
|
||||
|
|
|
@ -7,8 +7,11 @@ plugins {
|
|||
|
||||
group = "org.elasticsearch.gradle"
|
||||
version = versions.getProperty("elasticsearch")
|
||||
targetCompatibility = versions.get("minimumRuntimeJava")
|
||||
sourceCompatibility = versions.get("minimumRuntimeJava")
|
||||
|
||||
java {
|
||||
targetCompatibility = versions.get("minimumRuntimeJava")
|
||||
sourceCompatibility = versions.get("minimumRuntimeJava")
|
||||
}
|
||||
|
||||
tasks.named("jar").configure {
|
||||
archiveFileName = "${project.name}.jar"
|
||||
|
|
|
@ -11,6 +11,7 @@ package org.elasticsearch.gradle.plugin;
|
|||
import org.gradle.api.Project;
|
||||
import org.gradle.api.file.CopySpec;
|
||||
import org.gradle.api.file.RegularFileProperty;
|
||||
import org.gradle.api.plugins.BasePluginExtension;
|
||||
import org.gradle.api.plugins.ExtraPropertiesExtension;
|
||||
|
||||
import java.io.File;
|
||||
|
@ -62,7 +63,7 @@ public class PluginPropertiesExtension {
|
|||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.project.setProperty("archivesBaseName", name);
|
||||
this.project.getExtensions().getByType(BasePluginExtension.class).getArchivesName().set(name);
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
|
|
|
@ -14,8 +14,13 @@ group = 'org.elasticsearch.client'
|
|||
// Not published so no need to assemble
|
||||
tasks.named("assemble").configure { enabled = true }
|
||||
|
||||
archivesBaseName = 'client-benchmarks'
|
||||
mainClassName = 'org.elasticsearch.client.benchmark.BenchmarkMain'
|
||||
base {
|
||||
archivesName = 'client-benchmarks'
|
||||
}
|
||||
|
||||
application {
|
||||
mainClass = 'org.elasticsearch.client.benchmark.BenchmarkMain'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api 'org.apache.commons:commons-math3:3.2'
|
||||
|
@ -24,4 +29,4 @@ dependencies {
|
|||
api project(':client:rest')
|
||||
// bottleneck should be the client, not Elasticsearch
|
||||
api project(path: ':client:client-benchmark-noop-api-plugin')
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,7 +13,10 @@ apply plugin: 'com.github.johnrengelman.shadow'
|
|||
apply plugin: 'elasticsearch.rest-resources'
|
||||
|
||||
group = 'org.elasticsearch.client'
|
||||
archivesBaseName = 'elasticsearch-rest-high-level-client'
|
||||
|
||||
base {
|
||||
archivesName = 'elasticsearch-rest-high-level-client'
|
||||
}
|
||||
|
||||
restResources {
|
||||
//we need to copy the yaml spec so we can check naming (see RestHighlevelClientTests#testApiNamingConventions)
|
||||
|
|
|
@ -24,11 +24,16 @@ import org.elasticsearch.gradle.internal.conventions.precommit.LicenseHeadersTas
|
|||
apply plugin: 'elasticsearch.build'
|
||||
apply plugin: 'elasticsearch.publish'
|
||||
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
java {
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
group = 'org.elasticsearch.client'
|
||||
archivesBaseName = 'elasticsearch-rest-client'
|
||||
|
||||
base {
|
||||
archivesName = 'elasticsearch-rest-client'
|
||||
}
|
||||
|
||||
// LLRC is licenses under Apache 2.0
|
||||
projectLicenses.set(['The Apache Software License, Version 2.0': 'http://www.apache.org/licenses/LICENSE-2.0'])
|
||||
|
|
|
@ -21,11 +21,15 @@ import org.elasticsearch.gradle.internal.conventions.precommit.LicenseHeadersTas
|
|||
apply plugin: 'elasticsearch.build'
|
||||
apply plugin: 'elasticsearch.publish'
|
||||
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
java {
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
group = 'org.elasticsearch.client'
|
||||
archivesBaseName = 'elasticsearch-rest-client-sniffer'
|
||||
base {
|
||||
archivesName = 'elasticsearch-rest-client-sniffer'
|
||||
}
|
||||
|
||||
// rest client sniffer is licenses under Apache 2.0
|
||||
projectLicenses.set(['The Apache Software License, Version 2.0': 'http://www.apache.org/licenses/LICENSE-2.0'])
|
||||
|
|
|
@ -9,8 +9,10 @@ import org.elasticsearch.gradle.internal.conventions.precommit.LicenseHeadersTas
|
|||
|
||||
apply plugin: 'elasticsearch.build'
|
||||
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
java {
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
group = "${group}.client.test"
|
||||
|
||||
|
|
|
@ -21,7 +21,9 @@ tasks.named("processJavaRestTestResources").configure {
|
|||
}
|
||||
|
||||
// make the pom file name use elasticsearch instead of the project name
|
||||
archivesBaseName = "elasticsearch"
|
||||
base {
|
||||
archivesName = "elasticsearch"
|
||||
}
|
||||
ext.buildDist = parent.tasks.named("buildIntegTestZip")
|
||||
|
||||
publishing {
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
|
||||
apply plugin: 'elasticsearch.build'
|
||||
|
||||
archivesBaseName = 'elasticsearch-ansi-console'
|
||||
base {
|
||||
archivesName = 'elasticsearch-ansi-console'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(":server")
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
|
||||
apply plugin: 'elasticsearch.build'
|
||||
|
||||
archivesBaseName = 'elasticsearch-geoip-cli'
|
||||
base {
|
||||
archivesName = 'elasticsearch-geoip-cli'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(":server")
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
|
||||
apply plugin: 'elasticsearch.build'
|
||||
|
||||
archivesBaseName = 'elasticsearch-plugin-cli'
|
||||
base {
|
||||
archivesName = 'elasticsearch-plugin-cli'
|
||||
}
|
||||
|
||||
tasks.named("dependencyLicenses").configure {
|
||||
mapping from: /asm-.*/, to: 'asm'
|
||||
|
|
|
@ -35,7 +35,7 @@ junit5-vintage = { group = "org.junit.vintage", name="junit-vintage-engine", ver
|
|||
maven-model = "org.apache.maven:maven-model:3.6.2"
|
||||
mockito-core = "org.mockito:mockito-core:1.9.5"
|
||||
nebula-info = "com.netflix.nebula:gradle-info-plugin:11.3.3"
|
||||
shadow-plugin = "gradle.plugin.com.github.johnrengelman:shadow:8.0.0"
|
||||
shadow-plugin = "com.github.johnrengelman:shadow:8.1.1"
|
||||
spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" }
|
||||
spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" }
|
||||
spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" }
|
||||
|
|
|
@ -356,6 +356,11 @@
|
|||
<sha256 value="df7e2d5b8319efd51d015ab5071a271f8463158bc2f0979d05393fe028d856a0" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.github.johnrengelman" name="shadow" version="8.1.1">
|
||||
<artifact name="shadow-8.1.1.jar">
|
||||
<sha256 value="084197555590a53bb21b59508a3330559f536ddb448eafd1ec675f5462036fcf" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.github.spotbugs" name="spotbugs-annotations" version="4.0.2">
|
||||
<artifact name="spotbugs-annotations-4.0.2.jar">
|
||||
<sha256 value="3ef6c9f822b601aa151e10e123b49e5604243a4a99bcc47e4e1f9eea9781dc63" origin="Generated by Gradle"/>
|
||||
|
@ -1111,16 +1116,6 @@
|
|||
<sha256 value="2c52a6fabd5af9331d73fc7787dafc32a56bd8019c49f89749c2eeef244e303c" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="gradle.plugin.com.github.johnrengelman" name="shadow" version="7.1.2">
|
||||
<artifact name="shadow-7.1.2.jar">
|
||||
<sha256 value="bf705cc2ea5c0180aa870a0fa80b39bf13a14d27128e1eb3a4b674be34f58e90" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="gradle.plugin.com.github.johnrengelman" name="shadow" version="8.0.0">
|
||||
<artifact name="shadow-8.0.0.jar">
|
||||
<sha256 value="1b13b1ffbb2400dfba6b3758e691a7a843727bce161c7826a1e871e19196fe14" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="gradle.plugin.org.jetbrains.gradle.plugin.idea-ext" name="gradle-idea-ext" version="1.1.4">
|
||||
<artifact name="gradle-idea-ext-1.1.4.jar">
|
||||
<sha256 value="97d371d6996c3c510b5d6f0298dd541229b63248decc61159b73ab9ed59e777d" origin="Generated by Gradle"/>
|
||||
|
@ -1630,6 +1625,11 @@
|
|||
<sha256 value="5c6a438c3ebe7a306eba452b09fa307b0e60314926177920bca896c4a504eaf6" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.ant" name="ant" version="1.10.13">
|
||||
<artifact name="ant-1.10.13.jar">
|
||||
<sha256 value="befbfc79e744e9892cfa7db96df3b6e82dc17d2571af42aa427976fc22299838" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.ant" name="ant-launcher" version="1.10.11">
|
||||
<artifact name="ant-launcher-1.10.11.jar">
|
||||
<sha256 value="dab530df7a980b5ac8fd7e8d208243ae0d3ebd6de09b1aa2ce756360cc2ed256" origin="Generated by Gradle"/>
|
||||
|
@ -1640,6 +1640,11 @@
|
|||
<sha256 value="42a7ca7e7bb777fe7ee75a5ed4cc529c766bc43486367fdaad0ab4a32ee9c249" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.ant" name="ant-launcher" version="1.10.13">
|
||||
<artifact name="ant-launcher-1.10.13.jar">
|
||||
<sha256 value="cd7695b3bfb6964ab71b6a0b31dad60005ae77fe502132364679aacf08f77970" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.avro" name="avro" version="1.7.4">
|
||||
<artifact name="avro-1.7.4.jar">
|
||||
<sha256 value="a01d26e9a5ed0754e8c88dbb373fba896c57df0a0c424185767a3857855bb222" origin="Generated by Gradle"/>
|
||||
|
@ -2468,6 +2473,11 @@
|
|||
<sha256 value="5ccb24ad9f92e768d0bc456d3061a737951262df803e004d2cad096b75a88d60" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.logging.log4j" name="log4j-api" version="2.20.0">
|
||||
<artifact name="log4j-api-2.20.0.jar">
|
||||
<sha256 value="2f43eea679ea66f14ca0f13fec2a8600ac124f5a5231dcb4df8393eddcb97550" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.logging.log4j" name="log4j-core" version="2.17.1">
|
||||
<artifact name="log4j-core-2.17.1.jar">
|
||||
<sha256 value="c967f223487980b9364e94a7c7f9a8a01fd3ee7c19bdbf0b0f9f8cb8511f3d41" origin="Generated by Gradle"/>
|
||||
|
@ -2483,6 +2493,11 @@
|
|||
<sha256 value="b4a1796fab7bfc36df015c1b4052459147997e8d215a7199d71d05f9e747e4f4" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.logging.log4j" name="log4j-core" version="2.20.0">
|
||||
<artifact name="log4j-core-2.20.0.jar">
|
||||
<sha256 value="6137df848cdaed9f4d5076f75513c6c85da80b953f4e7acca38098b770763f55" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.logging.log4j" name="log4j-jcl" version="2.19.0">
|
||||
<artifact name="log4j-jcl-2.19.0.jar">
|
||||
<sha256 value="47f768ffd66107a66f0c2a19445ab1e42ce6719a7f30f9aa9ef96157c83949fd" origin="Generated by Gradle"/>
|
||||
|
@ -2916,6 +2931,11 @@
|
|||
<sha256 value="f957f13604ea1686de805801862f339dbbb6eab9a66f9cc7e4a5c5b27e4fcecc" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.codehaus.plexus" name="plexus-utils" version="3.5.1">
|
||||
<artifact name="plexus-utils-3.5.1.jar">
|
||||
<sha256 value="86e0255d4c879c61b4833ed7f13124e8bb679df47debb127326e7db7dd49a07b" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.codehaus.woodstox" name="stax2-api" version="4.2.1">
|
||||
<artifact name="stax2-api-4.2.1.jar">
|
||||
<sha256 value="678567e48b51a42c65c699f266539ad3d676d4b1a5b0ad7d89ece8b9d5772579" origin="Generated by Gradle"/>
|
||||
|
|
Binary file not shown.
|
@ -1,7 +1,8 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionSha256Sum=5625a0ae20fe000d9225d000b36909c7a0e0e8dda61c19b12da769add847c975
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
|
||||
distributionSha256Sum=5022b0b25fe182b0e50867e77f484501dba44feeea88f5c1f13b6b4660463640
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
@ -130,10 +130,13 @@ location of your Java installation."
|
|||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
|
||||
apply plugin: 'elasticsearch.java'
|
||||
|
||||
archivesBaseName = "x-content-impl"
|
||||
base {
|
||||
archivesName = "x-content-impl"
|
||||
}
|
||||
|
||||
String jacksonVersion = "2.15.0"
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ configure(subprojects.findAll { it.parent.path == project.path }) {
|
|||
|
||||
esplugin {
|
||||
// for local ES plugins, the name of the plugin is the same as the directory
|
||||
name project.name
|
||||
name = project.name
|
||||
}
|
||||
|
||||
if (project.file('src/main/packaging').exists()) {
|
||||
|
|
|
@ -10,7 +10,10 @@ apply plugin: 'elasticsearch.build'
|
|||
apply plugin: 'elasticsearch.publish'
|
||||
|
||||
group = 'org.elasticsearch.plugin'
|
||||
archivesBaseName = 'elasticsearch-scripting-painless-spi'
|
||||
|
||||
base {
|
||||
archivesName = 'elasticsearch-scripting-painless-spi'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(":server")
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionSha256Sum=5625a0ae20fe000d9225d000b36909c7a0e0e8dda61c19b12da769add847c975
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
|
||||
distributionSha256Sum=5022b0b25fe182b0e50867e77f484501dba44feeea88f5c1f13b6b4660463640
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
@ -21,7 +21,9 @@ publishing {
|
|||
}
|
||||
}
|
||||
|
||||
archivesBaseName = 'elasticsearch'
|
||||
base {
|
||||
archivesName = 'elasticsearch'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
|
|
|
@ -9,7 +9,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.analytics.AnalyticsPlugin'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-analytics'
|
||||
base {
|
||||
archivesName = 'x-pack-analytics'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api 'org.apache.commons:commons-math3:3.6.1'
|
||||
|
|
|
@ -6,7 +6,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.search.AsyncSearch'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-async-search'
|
||||
base {
|
||||
archivesName = 'x-pack-async-search'
|
||||
}
|
||||
|
||||
addQaCheckDependencies(project)
|
||||
|
||||
|
|
|
@ -6,7 +6,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.async.AsyncResultsIndexPlugin'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-async'
|
||||
base {
|
||||
archivesName = 'x-pack-async'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(":server")
|
||||
|
|
|
@ -9,7 +9,9 @@ esplugin {
|
|||
hasNativeController false
|
||||
requiresKeystore true
|
||||
}
|
||||
archivesBaseName = 'x-pack-autoscaling'
|
||||
base {
|
||||
archivesName = 'x-pack-autoscaling'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -8,7 +8,9 @@ apply plugin: 'elasticsearch.legacy-yaml-rest-compat-test'
|
|||
apply plugin: 'elasticsearch.validate-rest-spec'
|
||||
apply plugin: 'elasticsearch.internal-test-artifact'
|
||||
|
||||
archivesBaseName = 'x-pack'
|
||||
base {
|
||||
archivesName = 'x-pack'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testImplementation project(xpackModule('core'))
|
||||
|
|
|
@ -8,7 +8,9 @@ esplugin {
|
|||
requiresKeystore true
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-ccr'
|
||||
base {
|
||||
archivesName = 'x-pack-ccr'
|
||||
}
|
||||
|
||||
// Integration Test classes that cannot run with the security manager
|
||||
String[] noSecurityManagerITClasses = ["**/CloseFollowerIndexIT.class"]
|
||||
|
|
|
@ -11,7 +11,9 @@ apply plugin: 'elasticsearch.legacy-java-rest-test'
|
|||
apply plugin: 'elasticsearch.legacy-yaml-rest-compat-test'
|
||||
apply plugin: 'elasticsearch.internal-test-artifact'
|
||||
|
||||
archivesBaseName = 'x-pack-core'
|
||||
base {
|
||||
archivesName = 'x-pack-core'
|
||||
}
|
||||
|
||||
esplugin {
|
||||
name 'x-pack-core'
|
||||
|
|
|
@ -6,7 +6,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.deprecation.Deprecation'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-deprecation'
|
||||
base {
|
||||
archivesName = 'x-pack-deprecation'
|
||||
}
|
||||
|
||||
addQaCheckDependencies(project)
|
||||
|
||||
|
|
|
@ -6,7 +6,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.enrich.EnrichPlugin'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-enrich'
|
||||
base {
|
||||
archivesName = 'x-pack-enrich'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -9,7 +9,9 @@ esplugin {
|
|||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
|
||||
archivesBaseName = 'x-pack-ent-search'
|
||||
base {
|
||||
archivesName = 'x-pack-ent-search'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -8,7 +8,9 @@ esplugin {
|
|||
extendedPlugins = ['x-pack-ql', 'lang-painless']
|
||||
}
|
||||
|
||||
archivesBaseName = 'x-pack-eql'
|
||||
base {
|
||||
archivesName = 'x-pack-eql'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -6,7 +6,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.frozen.FrozenIndices'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-frozen-indices'
|
||||
base {
|
||||
archivesName = 'x-pack-frozen-indices'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -6,7 +6,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.graph.Graph'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-graph'
|
||||
base {
|
||||
archivesName = 'x-pack-graph'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -9,7 +9,9 @@ esplugin {
|
|||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
|
||||
archivesBaseName = 'x-pack-identity-provider'
|
||||
base {
|
||||
archivesName = 'x-pack-identity-provider'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -11,7 +11,9 @@ esplugin {
|
|||
hasNativeController false
|
||||
requiresKeystore true
|
||||
}
|
||||
archivesBaseName = 'x-pack-ilm'
|
||||
base {
|
||||
archivesName = 'x-pack-ilm'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -8,7 +8,9 @@ esplugin {
|
|||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
|
||||
archivesBaseName = 'x-pack-logstash'
|
||||
base {
|
||||
archivesName = 'x-pack-logstash'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -17,7 +17,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.aggregatemetric.AggregateMetricMapperPlugin'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-aggregate-metric'
|
||||
base {
|
||||
archivesName = 'x-pack-aggregate-metric'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -9,7 +9,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.constantkeyword.ConstantKeywordMapperPlugin'
|
||||
extendedPlugins = ['x-pack-core', 'lang-painless']
|
||||
}
|
||||
archivesBaseName = 'x-pack-constant-keyword'
|
||||
base {
|
||||
archivesName = 'x-pack-constant-keyword'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(':modules:lang-painless:spi')
|
||||
|
|
|
@ -20,7 +20,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.unsignedlong.UnsignedLongMapperPlugin'
|
||||
extendedPlugins = ['x-pack-core', 'lang-painless']
|
||||
}
|
||||
archivesBaseName = 'x-pack-unsigned-long'
|
||||
base {
|
||||
archivesName = 'x-pack-unsigned-long'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(':modules:lang-painless:spi')
|
||||
|
|
|
@ -14,7 +14,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.versionfield.VersionFieldPlugin'
|
||||
extendedPlugins = ['x-pack-core', 'lang-painless']
|
||||
}
|
||||
archivesBaseName = 'x-pack-mapper-version'
|
||||
base {
|
||||
archivesName = 'x-pack-mapper-version'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -8,7 +8,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.monitoring.Monitoring'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-monitoring'
|
||||
base {
|
||||
archivesName = 'x-pack-monitoring'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -8,7 +8,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.lucene.bwc.OldLuceneVersions'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-old-lucene-versions'
|
||||
base {
|
||||
archivesName = 'x-pack-old-lucene-versions'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -8,7 +8,9 @@ esplugin {
|
|||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
|
||||
archivesBaseName = 'x-pack-ql'
|
||||
base {
|
||||
archivesName = 'x-pack-ql'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api "org.antlr:antlr4-runtime:${versions.antlr4}"
|
||||
|
|
|
@ -6,7 +6,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.redact.RedactPlugin'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-redact'
|
||||
base {
|
||||
archivesName = 'x-pack-redact'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -7,7 +7,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.repositories.metering.RepositoriesMeteringPlugin'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-repositories-metering-api'
|
||||
base {
|
||||
archivesName = 'x-pack-repositories-metering-api'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -6,7 +6,9 @@ esplugin {
|
|||
extendedPlugins = ['x-pack-aggregate-metric']
|
||||
}
|
||||
|
||||
archivesBaseName = 'x-pack-rollup'
|
||||
base {
|
||||
archivesName = 'x-pack-rollup'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -7,7 +7,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.searchbusinessrules.SearchBusinessRules'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-searchbusinessrules'
|
||||
base {
|
||||
archivesName = 'x-pack-searchbusinessrules'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -8,7 +8,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshots'
|
||||
extendedPlugins = ['x-pack-core', 'blob-cache']
|
||||
}
|
||||
archivesBaseName = 'x-pack-searchable-snapshots'
|
||||
base {
|
||||
archivesName = 'x-pack-searchable-snapshots'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -11,7 +11,9 @@ esplugin {
|
|||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
|
||||
archivesBaseName = 'x-pack-security'
|
||||
base {
|
||||
archivesName = 'x-pack-security'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -3,7 +3,9 @@ import org.elasticsearch.gradle.internal.info.BuildParams
|
|||
|
||||
apply plugin: 'elasticsearch.build'
|
||||
|
||||
archivesBaseName = 'elasticsearch-security-cli'
|
||||
base {
|
||||
archivesName = 'elasticsearch-security-cli'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(":server")
|
||||
|
|
|
@ -9,7 +9,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.shutdown.ShutdownPlugin'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-shutdown'
|
||||
base {
|
||||
archivesName = 'x-pack-shutdown'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -8,7 +8,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.snapshotbasedrecoveries.SnapshotBasedRecoveriesPlugin'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-snapshot-based-recoveries'
|
||||
base {
|
||||
archivesName = 'x-pack-snapshot-based-recoveries'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(":server")
|
||||
|
|
|
@ -8,7 +8,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.repositories.blobstore.testkit.SnapshotRepositoryTestKit'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-snapshot-repo-test-kit'
|
||||
base {
|
||||
archivesName = 'x-pack-snapshot-repo-test-kit'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(xpackModule('core'))
|
||||
|
|
|
@ -4,9 +4,9 @@ apply plugin: 'elasticsearch.internal-cluster-test'
|
|||
import org.elasticsearch.gradle.internal.info.BuildParams
|
||||
|
||||
esplugin {
|
||||
name 'x-pack-sql'
|
||||
name = 'x-pack-sql'
|
||||
description 'The Elasticsearch plugin that powers SQL for Elasticsearch'
|
||||
classname 'org.elasticsearch.xpack.sql.plugin.SqlPlugin'
|
||||
classname = 'org.elasticsearch.xpack.sql.plugin.SqlPlugin'
|
||||
extendedPlugins = ['x-pack-ql', 'lang-painless']
|
||||
}
|
||||
|
||||
|
@ -25,7 +25,9 @@ configurations {
|
|||
bin
|
||||
}
|
||||
|
||||
archivesBaseName = 'x-pack-sql'
|
||||
base {
|
||||
archivesName = 'x-pack-sql'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -3,7 +3,10 @@ apply plugin: 'elasticsearch.publish'
|
|||
apply plugin: 'com.github.johnrengelman.shadow'
|
||||
|
||||
description = 'JDBC driver for Elasticsearch'
|
||||
archivesBaseName = "x-pack-sql-jdbc"
|
||||
|
||||
base {
|
||||
archivesName = "x-pack-sql-jdbc"
|
||||
}
|
||||
|
||||
tasks.named('forbiddenApisMain').configure {
|
||||
// does not depend on core, so only jdk and http signatures should be checked
|
||||
|
|
|
@ -44,7 +44,7 @@ subprojects {
|
|||
|
||||
tasks.withType(RestIntegTestTask).configureEach {
|
||||
dependsOn copyTestClasses
|
||||
classpath = configurations.testArtifacts
|
||||
classpath += configurations.testArtifacts
|
||||
testClassesDirs = project.files(testArtifactsDir)
|
||||
nonInputProperties.systemProperty 'tests.audit.logfile',
|
||||
"${-> testClusters.javaRestTest.singleNode().getAuditLog()}"
|
||||
|
|
|
@ -12,7 +12,9 @@ apply plugin: 'com.github.johnrengelman.shadow'
|
|||
/* We don't use the 'application' plugin because it builds a zip and tgz which
|
||||
* we don't want. */
|
||||
|
||||
archivesBaseName = 'elasticsearch-sql-cli'
|
||||
base {
|
||||
archivesName = 'elasticsearch-sql-cli'
|
||||
}
|
||||
|
||||
description = 'Command line interface to Elasticsearch that speaks SQL'
|
||||
|
||||
|
|
|
@ -8,11 +8,13 @@ esplugin {
|
|||
hasNativeController false
|
||||
requiresKeystore true
|
||||
}
|
||||
archivesBaseName = 'x-pack-stack'
|
||||
base {
|
||||
archivesName = 'x-pack-stack'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
testImplementation(testArtifact(project(xpackModule('core'))))
|
||||
}
|
||||
|
||||
addQaCheckDependencies(project)
|
||||
addQaCheckDependencies(project)
|
||||
|
|
|
@ -5,7 +5,9 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.textstructure.TextStructurePlugin'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-text-structure'
|
||||
base {
|
||||
archivesName = 'x-pack-text-structure'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
|
@ -9,7 +9,9 @@ esplugin {
|
|||
extendedPlugins = ['x-pack-core', 'lang-painless']
|
||||
}
|
||||
|
||||
archivesBaseName = 'x-pack-watcher'
|
||||
base {
|
||||
archivesName = 'x-pack-watcher'
|
||||
}
|
||||
|
||||
ext.compactProfile = 'full'
|
||||
|
||||
|
|
|
@ -9,7 +9,10 @@ esplugin {
|
|||
classname 'org.elasticsearch.xpack.wildcard.Wildcard'
|
||||
extendedPlugins = ['x-pack-core', 'lang-painless']
|
||||
}
|
||||
archivesBaseName = 'x-pack-wildcard'
|
||||
|
||||
base {
|
||||
archivesName = 'x-pack-wildcard'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(':modules:lang-painless:spi')
|
||||
|
|
|
@ -2,12 +2,15 @@ apply plugin: 'elasticsearch.internal-es-plugin'
|
|||
apply plugin: 'elasticsearch.internal-cluster-test'
|
||||
|
||||
esplugin {
|
||||
name 'x-pack-write-load-forecaster'
|
||||
name = 'x-pack-write-load-forecaster'
|
||||
description 'x'
|
||||
classname 'org.elasticsearch.xpack.writeloadforecaster.WriteLoadForecasterPlugin'
|
||||
classname = 'org.elasticsearch.xpack.writeloadforecaster.WriteLoadForecasterPlugin'
|
||||
extendedPlugins = ['x-pack-core']
|
||||
}
|
||||
archivesBaseName = 'x-pack-write-load-forecaster'
|
||||
|
||||
base {
|
||||
archivesName = 'x-pack-write-load-forecaster'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly project(path: xpackModule('core'))
|
||||
|
|
Loading…
Reference in New Issue