From e5d5c17c99c476e9820ed141edd87af0c3adbef5 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 29 Oct 2024 13:02:28 -0700 Subject: [PATCH] Use directory name as project name for libs (#115720) The libs projects are configured to all begin with `elasticsearch-`. While this is desireable for the artifacts to contain this consistent prefix, it means the project names don't match up with their directories. Additionally, it creates complexities for subproject naming that must be manually adjusted. This commit adjusts the project names for those under libs to be their directory names. The resulting artifacts for these libs are kept the same, all beginning with `elasticsearch-`. --- benchmarks/build.gradle | 6 +-- .../internal/PublishPluginFuncTest.groovy | 2 +- .../src/main/groovy/elasticsearch.ide.gradle | 2 +- .../groovy/elasticsearch.stable-api.gradle | 6 +-- .../internal/ElasticsearchJavaBasePlugin.java | 2 +- .../InternalDistributionBwcSetupPlugin.java | 13 ++++-- .../precommit/JarHellPrecommitPlugin.java | 4 +- .../ThirdPartyAuditPrecommitPlugin.java | 2 +- .../fixtures/AbstractGradleFuncTest.groovy | 2 +- client/rest/build.gradle | 2 +- client/sniffer/build.gradle | 2 +- client/test/build.gradle | 2 +- distribution/build.gradle | 4 +- .../tools/entitlement-agent/build.gradle | 2 +- .../tools/entitlement-runtime/build.gradle | 4 +- distribution/tools/geoip-cli/build.gradle | 4 +- distribution/tools/keystore-cli/build.gradle | 2 +- distribution/tools/plugin-cli/build.gradle | 6 +-- distribution/tools/server-cli/build.gradle | 2 +- .../tools/windows-service-cli/build.gradle | 2 +- libs/build.gradle | 40 +++++++++++++++++-- libs/cli/build.gradle | 4 +- libs/core/build.gradle | 6 +-- libs/dissect/build.gradle | 2 +- libs/geo/build.gradle | 2 +- libs/grok/build.gradle | 2 +- libs/h3/build.gradle | 4 +- libs/logging/build.gradle | 4 +- libs/logstash-bridge/build.gradle | 6 +-- libs/lz4/build.gradle | 4 +- libs/native/build.gradle | 6 +-- libs/plugin-analysis-api/build.gradle | 4 +- libs/plugin-scanner/build.gradle | 8 ++-- libs/secure-sm/build.gradle | 2 +- libs/simdvec/build.gradle | 6 +-- libs/ssl-config/build.gradle | 4 +- libs/tdigest/build.gradle | 4 +- libs/x-content/build.gradle | 6 +-- libs/x-content/impl/build.gradle | 6 +-- modules/ingest-common/build.gradle | 4 +- modules/reindex/build.gradle | 2 +- modules/runtime-fields-common/build.gradle | 4 +- modules/systemd/build.gradle | 2 +- modules/transport-netty4/build.gradle | 4 +- qa/logging-config/build.gradle | 2 +- qa/packaging/build.gradle | 2 +- server/build.gradle | 26 ++++++------ settings.gradle | 12 +----- .../apm-integration/build.gradle | 2 +- test/fixtures/geoip-fixture/build.gradle | 4 +- test/framework/build.gradle | 4 +- test/x-content/build.gradle | 2 +- x-pack/plugin/blob-cache/build.gradle | 2 +- x-pack/plugin/core/build.gradle | 4 +- x-pack/plugin/esql/build.gradle | 4 +- .../plugin/esql/qa/testFixtures/build.gradle | 4 +- x-pack/plugin/inference/build.gradle | 2 +- x-pack/plugin/ml-package-loader/build.gradle | 2 +- x-pack/plugin/ml/build.gradle | 2 +- .../plugin/searchable-snapshots/build.gradle | 2 +- x-pack/plugin/spatial/build.gradle | 2 +- x-pack/plugin/sql/sql-action/build.gradle | 6 +-- x-pack/plugin/sql/sql-cli/build.gradle | 2 +- x-pack/plugin/sql/sql-proto/build.gradle | 4 +- x-pack/plugin/text-structure/build.gradle | 2 +- .../plugin/transform/qa/common/build.gradle | 2 +- 66 files changed, 165 insertions(+), 136 deletions(-) diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index 3a03cbe2d934..f3ced9f16d32 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -40,15 +40,15 @@ dependencies { // us to invoke the JMH uberjar as usual. exclude group: 'net.sf.jopt-simple', module: 'jopt-simple' } - api(project(':libs:elasticsearch-h3')) + api(project(':libs:h3')) api(project(':modules:aggregations')) api(project(':x-pack:plugin:esql-core')) api(project(':x-pack:plugin:esql')) api(project(':x-pack:plugin:esql:compute')) - implementation project(path: ':libs:elasticsearch-simdvec') + implementation project(path: ':libs:simdvec') expression(project(path: ':modules:lang-expression', configuration: 'zip')) painless(project(path: ':modules:lang-painless', configuration: 'zip')) - nativeLib(project(':libs:elasticsearch-native')) + nativeLib(project(':libs:native')) api "org.openjdk.jmh:jmh-core:$versions.jmh" annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$versions.jmh" // Dependencies of JMH diff --git a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy index 99d451116dbe..6e403c85a23f 100644 --- a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy +++ b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy @@ -18,7 +18,7 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest { def setup() { // required for JarHell to work - subProject(":libs:elasticsearch-core") << "apply plugin:'java'" + subProject(":libs:core") << "apply plugin:'java'" configurationCacheCompatible = false } diff --git a/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle b/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle index 67878181a005..86b48f744e16 100644 --- a/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle +++ b/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle @@ -161,7 +161,7 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') { ':server:generateModulesList', ':server:generatePluginsList', ':generateProviderImpls', - ':libs:elasticsearch-native:elasticsearch-native-libraries:extractLibs', + ':libs:native:native-libraries:extractLibs', ':x-pack:libs:es-opensaml-security-api:shadowJar'].collect { elasticsearchProject.right()?.task(it) ?: it }) } diff --git a/build-tools-internal/src/main/groovy/elasticsearch.stable-api.gradle b/build-tools-internal/src/main/groovy/elasticsearch.stable-api.gradle index 0148caf8983e..1fab4d035177 100644 --- a/build-tools-internal/src/main/groovy/elasticsearch.stable-api.gradle +++ b/build-tools-internal/src/main/groovy/elasticsearch.stable-api.gradle @@ -33,12 +33,12 @@ BuildParams.bwcVersions.withIndexCompatible({ it.onOrAfter(Version.fromString(ex if (unreleasedVersion) { // For unreleased snapshot versions, build them from source "oldJar${baseName}"(files(project(unreleasedVersion.gradleProjectPath).tasks.named(buildBwcTaskName(project.name)))) - } else if(bwcVersion.onOrAfter('8.7.0') && project.name.endsWith("elasticsearch-logging")==false) { + } else if(bwcVersion.onOrAfter('8.7.0') && project.name.endsWith("logging")==false) { //there was a package rename in 8.7.0, except for es-logging - "oldJar${baseName}"("org.elasticsearch.plugin:${project.name}:${bwcVersion}") + "oldJar${baseName}"("org.elasticsearch.plugin:elasticsearch-${project.name}:${bwcVersion}") } else { // For released versions, download it - "oldJar${baseName}"("org.elasticsearch:${project.name}:${bwcVersion}") + "oldJar${baseName}"("org.elasticsearch:elasticsearch-${project.name}:${bwcVersion}") } } diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java index 5913339e32f4..05b7af83aa8e 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java @@ -177,7 +177,7 @@ public class ElasticsearchJavaBasePlugin implements Plugin { } private static void configureNativeLibraryPath(Project project) { - String nativeProject = ":libs:elasticsearch-native:elasticsearch-native-libraries"; + String nativeProject = ":libs:native:native-libraries"; Configuration nativeConfig = project.getConfigurations().create("nativeLibs"); nativeConfig.defaultDependencies(deps -> { deps.add(project.getDependencies().project(Map.of("path", nativeProject, "configuration", "default"))); diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java index 90b9c0d395f4..fcf286ed471d 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java @@ -165,7 +165,12 @@ public class InternalDistributionBwcSetupPlugin implements Plugin { DistributionProjectArtifact stableAnalysisPluginProjectArtifact = new DistributionProjectArtifact( new File( checkoutDir.get(), - relativeDir + "/build/distributions/" + stableApiProject.getName() + "-" + bwcVersion.get() + "-SNAPSHOT.jar" + relativeDir + + "/build/distributions/elasticsearch-" + + stableApiProject.getName() + + "-" + + bwcVersion.get() + + "-SNAPSHOT.jar" ), null ); @@ -275,7 +280,7 @@ public class InternalDistributionBwcSetupPlugin implements Plugin { } private static List resolveStableProjects(Project project) { - Set stableProjectNames = Set.of("elasticsearch-logging", "elasticsearch-plugin-api", "elasticsearch-plugin-analysis-api"); + Set stableProjectNames = Set.of("logging", "plugin-api", "plugin-analysis-api"); return project.findProject(":libs") .getSubprojects() .stream() @@ -312,7 +317,9 @@ public class InternalDistributionBwcSetupPlugin implements Plugin { c.getOutputs().files(expectedOutputFile); } c.getOutputs().doNotCacheIf("BWC distribution caching is disabled for local builds", task -> BuildParams.isCi() == false); - c.getArgs().add(projectPath.replace('/', ':') + ":" + assembleTaskName); + c.getArgs().add("-p"); + c.getArgs().add(projectPath); + c.getArgs().add(assembleTaskName); if (project.getGradle().getStartParameter().isBuildCacheEnabled()) { c.getArgs().add("--build-cache"); } diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/JarHellPrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/JarHellPrecommitPlugin.java index 56434cf1f4ed..0a22a2b61c95 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/JarHellPrecommitPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/JarHellPrecommitPlugin.java @@ -21,11 +21,11 @@ public class JarHellPrecommitPlugin extends PrecommitPlugin { public TaskProvider createTask(Project project) { project.getPluginManager().apply(JarHellPlugin.class); - if (project.getPath().equals(":libs:elasticsearch-core") == false) { + if (project.getPath().equals(":libs:core") == false) { // ideally we would configure this as a default dependency. But Default dependencies do not work correctly // with gradle project dependencies as they're resolved to late in the build and don't setup according task // dependencies properly - var elasticsearchCoreProject = project.findProject(":libs:elasticsearch-core"); + var elasticsearchCoreProject = project.findProject(":libs:core"); if (elasticsearchCoreProject != null) { project.getDependencies().add("jarHell", elasticsearchCoreProject); } diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditPrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditPrecommitPlugin.java index f0eefe1f81a8..80cece6074ab 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditPrecommitPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditPrecommitPlugin.java @@ -27,7 +27,7 @@ import static org.elasticsearch.gradle.internal.util.DependenciesUtils.createFil public class ThirdPartyAuditPrecommitPlugin extends PrecommitPlugin { public static final String JDK_JAR_HELL_CONFIG_NAME = "jdkJarHell"; - public static final String LIBS_ELASTICSEARCH_CORE_PROJECT_PATH = ":libs:elasticsearch-core"; + public static final String LIBS_ELASTICSEARCH_CORE_PROJECT_PATH = ":libs:core"; @Override public TaskProvider createTask(Project project) { diff --git a/build-tools/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy b/build-tools/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy index 567fb048fad5..d3d06b2de357 100644 --- a/build-tools/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy +++ b/build-tools/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy @@ -56,7 +56,7 @@ abstract class AbstractGradleFuncTest extends Specification { propertiesFile << "org.gradle.java.installations.fromEnv=JAVA_HOME,RUNTIME_JAVA_HOME,JAVA15_HOME,JAVA14_HOME,JAVA13_HOME,JAVA12_HOME,JAVA11_HOME,JAVA8_HOME" - def nativeLibsProject = subProject(":libs:elasticsearch-native:elasticsearch-native-libraries") + def nativeLibsProject = subProject(":libs:native:native-libraries") nativeLibsProject << """ plugins { id 'base' diff --git a/client/rest/build.gradle b/client/rest/build.gradle index 6006fae1c2d8..003c25118651 100644 --- a/client/rest/build.gradle +++ b/client/rest/build.gradle @@ -79,7 +79,7 @@ tasks.named('forbiddenApisTest').configure { } // JarHell is part of es server, which we don't want to pull in -// TODO: Not anymore. Now in :libs:elasticsearch-core +// TODO: Not anymore. Now in :libs:core tasks.named("jarHell").configure { enabled = false } diff --git a/client/sniffer/build.gradle b/client/sniffer/build.gradle index 901917c7b25f..f6f26c8f7c0d 100644 --- a/client/sniffer/build.gradle +++ b/client/sniffer/build.gradle @@ -73,7 +73,7 @@ tasks.named("dependencyLicenses").configure { } // JarHell is part of es server, which we don't want to pull in -// TODO: Not anymore. Now in :libs:elasticsearch-core +// TODO: Not anymore. Now in :libs:core tasks.named("jarHell").configure { enabled = false } tasks.named("testTestingConventions").configure { diff --git a/client/test/build.gradle b/client/test/build.gradle index 3a3a9e3c0326..8de6b3dbf92b 100644 --- a/client/test/build.gradle +++ b/client/test/build.gradle @@ -54,7 +54,7 @@ tasks.named('forbiddenApisTest').configure { tasks.named("thirdPartyAudit").configure { enabled = false } // JarHell is part of es server, which we don't want to pull in -// TODO: Not anymore. Now in :libs:elasticsearch-core +// TODO: Not anymore. Now in :libs:core tasks.named("jarHell").configure { enabled = false } // TODO: should we have licenses for our test deps? diff --git a/distribution/build.gradle b/distribution/build.gradle index 72dea714fdcd..f7b6f7bc1c7d 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -275,7 +275,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) { } all { resolutionStrategy.dependencySubstitution { - substitute module("org.apache.logging.log4j:log4j-core") using project(":libs:elasticsearch-log4j") because "patched to remove JndiLookup clas"} + substitute module("org.apache.logging.log4j:log4j-core") using project(":libs:log4j") because "patched to remove JndiLookup clas"} } } @@ -291,7 +291,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) { libsKeystoreCli project(path: ':distribution:tools:keystore-cli') libsSecurityCli project(':x-pack:plugin:security:cli') libsGeoIpCli project(':distribution:tools:geoip-cli') - libsNative project(':libs:elasticsearch-native:elasticsearch-native-libraries') + libsNative project(':libs:native:native-libraries') } project.ext { diff --git a/distribution/tools/entitlement-agent/build.gradle b/distribution/tools/entitlement-agent/build.gradle index 3fa9d0f5ef83..d3e7ae10dcc6 100644 --- a/distribution/tools/entitlement-agent/build.gradle +++ b/distribution/tools/entitlement-agent/build.gradle @@ -22,7 +22,7 @@ configurations { dependencies { entitlementBridge project(":distribution:tools:entitlement-bridge") - compileOnly project(":libs:elasticsearch-core") + compileOnly project(":libs:core") compileOnly project(":distribution:tools:entitlement-runtime") testImplementation project(":test:framework") testImplementation project(":distribution:tools:entitlement-bridge") diff --git a/distribution/tools/entitlement-runtime/build.gradle b/distribution/tools/entitlement-runtime/build.gradle index 55471272c1b5..aaeee76d8bc5 100644 --- a/distribution/tools/entitlement-runtime/build.gradle +++ b/distribution/tools/entitlement-runtime/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'elasticsearch.build' apply plugin: 'elasticsearch.publish' dependencies { - compileOnly project(':libs:elasticsearch-core') // For @SuppressForbidden - compileOnly project(":libs:elasticsearch-x-content") // for parsing policy files + compileOnly project(':libs:core') // For @SuppressForbidden + compileOnly project(":libs:x-content") // for parsing policy files compileOnly project(':server') // To access the main server module for special permission checks compileOnly project(':distribution:tools:entitlement-bridge') testImplementation project(":test:framework") diff --git a/distribution/tools/geoip-cli/build.gradle b/distribution/tools/geoip-cli/build.gradle index ee20d5e1bd88..26af3bb4f991 100644 --- a/distribution/tools/geoip-cli/build.gradle +++ b/distribution/tools/geoip-cli/build.gradle @@ -15,8 +15,8 @@ base { dependencies { compileOnly project(":server") - compileOnly project(":libs:elasticsearch-cli") - compileOnly project(":libs:elasticsearch-x-content") + compileOnly project(":libs:cli") + compileOnly project(":libs:x-content") testImplementation project(":test:framework") testImplementation "org.apache.commons:commons-compress:1.26.1" testImplementation "commons-io:commons-io:2.15.1" diff --git a/distribution/tools/keystore-cli/build.gradle b/distribution/tools/keystore-cli/build.gradle index 07aa92151171..0140cd9d8eed 100644 --- a/distribution/tools/keystore-cli/build.gradle +++ b/distribution/tools/keystore-cli/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'elasticsearch.build' dependencies { compileOnly project(":server") - compileOnly project(":libs:elasticsearch-cli") + compileOnly project(":libs:cli") testImplementation project(":test:framework") testImplementation "com.google.jimfs:jimfs:${versions.jimfs}" testRuntimeOnly "com.google.guava:guava:${versions.jimfs_guava}" diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index 16932df96e22..ac8ade89c901 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -21,9 +21,9 @@ tasks.named("dependencyLicenses").configure { dependencies { compileOnly project(":server") - compileOnly project(":libs:elasticsearch-cli") - implementation project(":libs:elasticsearch-plugin-api") - implementation project(":libs:elasticsearch-plugin-scanner") + compileOnly project(":libs:cli") + implementation project(":libs:plugin-api") + implementation project(":libs:plugin-scanner") // TODO: asm is picked up from the plugin scanner, we should consolidate so it is not defined twice implementation 'org.ow2.asm:asm:9.7' implementation 'org.ow2.asm:asm-tree:9.7' diff --git a/distribution/tools/server-cli/build.gradle b/distribution/tools/server-cli/build.gradle index e8f70e9053d7..299d511ba5db 100644 --- a/distribution/tools/server-cli/build.gradle +++ b/distribution/tools/server-cli/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'elasticsearch.build' dependencies { compileOnly project(":server") - compileOnly project(":libs:elasticsearch-cli") + compileOnly project(":libs:cli") testImplementation project(":test:framework") } diff --git a/distribution/tools/windows-service-cli/build.gradle b/distribution/tools/windows-service-cli/build.gradle index 77da0d407a40..dcfaf244b7ee 100644 --- a/distribution/tools/windows-service-cli/build.gradle +++ b/distribution/tools/windows-service-cli/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.build' dependencies { compileOnly project(":server") - compileOnly project(":libs:elasticsearch-cli") + compileOnly project(":libs:cli") compileOnly project(":distribution:tools:server-cli") testImplementation project(":test:framework") diff --git a/libs/build.gradle b/libs/build.gradle index d0dfabd9c4fc..efd2329ca2b5 100644 --- a/libs/build.gradle +++ b/libs/build.gradle @@ -7,10 +7,42 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -configure(childProjects.values() - project('elasticsearch-log4j')) { +configure(childProjects.values()) { + + apply plugin: 'base' + /* - * All subprojects are java projects using Elasticsearch's standard build - * tools. + * Although these libs are local to Elasticsearch, they can conflict with other similarly + * named libraries when downloaded into a single directory via maven. Here we set the + * name of all libs to begin with the "elasticsearch-" prefix. Additionally, subprojects + * of libs begin with their parents artifactId. */ - apply plugin: 'elasticsearch.build' + def baseProject = project + def baseArtifactId = "elasticsearch-${it.name}" + base { + archivesName = baseArtifactId + } + subprojects { + apply plugin: 'base' + + def subArtifactId = baseArtifactId + def currentProject = project + while (currentProject != baseProject) { + subArtifactId += "-${currentProject.name}" + currentProject = currentProject.parent + } + base { + archivesName = subArtifactId + } + } + + // log4j is a hack, and not really a full elasticsearch built jar + if (project.name != 'log4j') { + + /* + * All subprojects are java projects using Elasticsearch's standard build + * tools. + */ + apply plugin: 'elasticsearch.build' + } } diff --git a/libs/cli/build.gradle b/libs/cli/build.gradle index b6ae962eaa60..d5842d4a2c59 100644 --- a/libs/cli/build.gradle +++ b/libs/cli/build.gradle @@ -11,10 +11,10 @@ apply plugin: 'elasticsearch.publish' dependencies { api 'net.sf.jopt-simple:jopt-simple:5.0.2' - api project(':libs:elasticsearch-core') + api project(':libs:core') testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-cli' + exclude group: 'org.elasticsearch', module: 'cli' } } diff --git a/libs/core/build.gradle b/libs/core/build.gradle index ebbeac141e4b..e24417e09a53 100644 --- a/libs/core/build.gradle +++ b/libs/core/build.gradle @@ -13,19 +13,19 @@ apply plugin: 'elasticsearch.mrjar' dependencies { // This dependency is used only by :libs:core for null-checking interop with other tools compileOnly "com.google.code.findbugs:jsr305:3.0.2" - compileOnly project(':libs:elasticsearch-logging') + compileOnly project(':libs:logging') testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testImplementation "junit:junit:${versions.junit}" testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}" testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-core' + exclude group: 'org.elasticsearch', module: 'core' } } tasks.named('forbiddenApisMain').configure { - // :libs:elasticsearch-core does not depend on server + // :libs:core does not depend on server // TODO: Need to decide how we want to handle for forbidden signatures with the changes to server replaceSignatureFiles 'jdk-signatures' } diff --git a/libs/dissect/build.gradle b/libs/dissect/build.gradle index be2691bfd332..f1a09cc0ba0e 100644 --- a/libs/dissect/build.gradle +++ b/libs/dissect/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-dissect' + exclude group: 'org.elasticsearch', module: 'dissect' } testImplementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" testImplementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" diff --git a/libs/geo/build.gradle b/libs/geo/build.gradle index 37dd65cb1926..c753ba814a5f 100644 --- a/libs/geo/build.gradle +++ b/libs/geo/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'elasticsearch.publish' dependencies { testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-geo' + exclude group: 'org.elasticsearch', module: 'geo' } } diff --git a/libs/grok/build.gradle b/libs/grok/build.gradle index ce4be699953c..2a74927fedd8 100644 --- a/libs/grok/build.gradle +++ b/libs/grok/build.gradle @@ -14,7 +14,7 @@ dependencies { api 'org.jruby.jcodings:jcodings:1.0.44' testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-grok' + exclude group: 'org.elasticsearch', module: 'grok' } } diff --git a/libs/h3/build.gradle b/libs/h3/build.gradle index 0eb1aea09d49..81a0d56ed460 100644 --- a/libs/h3/build.gradle +++ b/libs/h3/build.gradle @@ -23,7 +23,7 @@ apply plugin: 'elasticsearch.publish' dependencies { testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-geo' + exclude group: 'org.elasticsearch', module: 'geo' } // lucene topology library that uses spherical geometry testImplementation "org.apache.lucene:lucene-spatial3d:${versions.lucene}" @@ -40,4 +40,4 @@ licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt')) tasks.withType(LicenseHeadersTask.class).configureEach { approvedLicenses = ['Apache', 'Generated', 'Vendored'] -} \ No newline at end of file +} diff --git a/libs/logging/build.gradle b/libs/logging/build.gradle index 4222d89ebe2d..f52c2629176a 100644 --- a/libs/logging/build.gradle +++ b/libs/logging/build.gradle @@ -14,12 +14,12 @@ tasks.named("loggerUsageCheck").configure {enabled = false } dependencies { testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-logging' + exclude group: 'org.elasticsearch', module: 'logging' } } tasks.named('forbiddenApisMain').configure { - // :libs:elasticsearch-logging does not depend on server + // :libs:logging does not depend on server replaceSignatureFiles 'jdk-signatures' } diff --git a/libs/logstash-bridge/build.gradle b/libs/logstash-bridge/build.gradle index e4b2728f693a..117bed1e9810 100644 --- a/libs/logstash-bridge/build.gradle +++ b/libs/logstash-bridge/build.gradle @@ -10,9 +10,9 @@ apply plugin: 'elasticsearch.build' dependencies { compileOnly project(':server') - compileOnly project(':libs:elasticsearch-core') - compileOnly project(':libs:elasticsearch-plugin-api') - compileOnly project(':libs:elasticsearch-x-content') + compileOnly project(':libs:core') + compileOnly project(':libs:plugin-api') + compileOnly project(':libs:x-content') compileOnly project(':modules:lang-painless') compileOnly project(':modules:lang-painless:spi') compileOnly project(':modules:lang-mustache') diff --git a/libs/lz4/build.gradle b/libs/lz4/build.gradle index d9f117524812..72e1bb50187a 100644 --- a/libs/lz4/build.gradle +++ b/libs/lz4/build.gradle @@ -10,10 +10,10 @@ apply plugin: 'elasticsearch.publish' dependencies { api 'org.lz4:lz4-java:1.8.0' - api project(':libs:elasticsearch-core') + api project(':libs:core') testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-lz4' + exclude group: 'org.elasticsearch', module: 'lz4' } } diff --git a/libs/native/build.gradle b/libs/native/build.gradle index 0c889d47566f..eff8f8243446 100644 --- a/libs/native/build.gradle +++ b/libs/native/build.gradle @@ -14,10 +14,10 @@ apply plugin: 'elasticsearch.build' apply plugin: 'elasticsearch.mrjar' dependencies { - api project(':libs:elasticsearch-core') - api project(':libs:elasticsearch-logging') + api project(':libs:core') + api project(':libs:logging') testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-native' + exclude group: 'org.elasticsearch', module: 'native' } } diff --git a/libs/plugin-analysis-api/build.gradle b/libs/plugin-analysis-api/build.gradle index e240f18a88e0..3f1670d76a0c 100644 --- a/libs/plugin-analysis-api/build.gradle +++ b/libs/plugin-analysis-api/build.gradle @@ -18,12 +18,12 @@ tasks.named("loggerUsageCheck").configure {enabled = false } dependencies { api "org.apache.lucene:lucene-core:${versions.lucene}" - api project(':libs:elasticsearch-plugin-api') + api project(':libs:plugin-api') } tasks.named('forbiddenApisMain').configure { - // :libs:elasticsearch-logging does not depend on server + // :libs:logging does not depend on server replaceSignatureFiles 'jdk-signatures' } diff --git a/libs/plugin-scanner/build.gradle b/libs/plugin-scanner/build.gradle index b8cd224eba46..d04af0624b3b 100644 --- a/libs/plugin-scanner/build.gradle +++ b/libs/plugin-scanner/build.gradle @@ -16,16 +16,16 @@ tasks.named("dependencyLicenses").configure { } dependencies { - api project(':libs:elasticsearch-core') - api project(':libs:elasticsearch-plugin-api') - api project(":libs:elasticsearch-x-content") + api project(':libs:core') + api project(':libs:plugin-api') + api project(":libs:x-content") api 'org.ow2.asm:asm:9.7' api 'org.ow2.asm:asm-tree:9.7' testImplementation "junit:junit:${versions.junit}" testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-plugin-scanner' + exclude group: 'org.elasticsearch', module: 'plugin-scanner' } } tasks.named('forbiddenApisMain').configure { diff --git a/libs/secure-sm/build.gradle b/libs/secure-sm/build.gradle index 5e35f3ac7126..473a86215e91 100644 --- a/libs/secure-sm/build.gradle +++ b/libs/secure-sm/build.gradle @@ -16,7 +16,7 @@ dependencies { testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}" testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-secure-sm' + exclude group: 'org.elasticsearch', module: 'secure-sm' } } diff --git a/libs/simdvec/build.gradle b/libs/simdvec/build.gradle index eee56be72d0b..02f960130e69 100644 --- a/libs/simdvec/build.gradle +++ b/libs/simdvec/build.gradle @@ -15,12 +15,12 @@ apply plugin: 'elasticsearch.build' apply plugin: 'elasticsearch.mrjar' dependencies { - implementation project(':libs:elasticsearch-native') - implementation project(':libs:elasticsearch-logging') + implementation project(':libs:native') + implementation project(':libs:logging') implementation "org.apache.lucene:lucene-core:${versions.lucene}" testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-native' + exclude group: 'org.elasticsearch', module: 'native' } } diff --git a/libs/ssl-config/build.gradle b/libs/ssl-config/build.gradle index 3c0eb7c44051..d63df95003ab 100644 --- a/libs/ssl-config/build.gradle +++ b/libs/ssl-config/build.gradle @@ -9,10 +9,10 @@ apply plugin: "elasticsearch.publish" dependencies { - api project(':libs:elasticsearch-core') + api project(':libs:core') testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-ssl-config' + exclude group: 'org.elasticsearch', module: 'ssl-config' } testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" diff --git a/libs/tdigest/build.gradle b/libs/tdigest/build.gradle index 231eb845339a..2713df701fb4 100644 --- a/libs/tdigest/build.gradle +++ b/libs/tdigest/build.gradle @@ -22,11 +22,11 @@ apply plugin: 'elasticsearch.build' apply plugin: 'elasticsearch.publish' dependencies { - api project(':libs:elasticsearch-core') + api project(':libs:core') api "org.apache.lucene:lucene-core:${versions.lucene}" testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-tdigest' + exclude group: 'org.elasticsearch', module: 'tdigest' } testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' } diff --git a/libs/x-content/build.gradle b/libs/x-content/build.gradle index 7540bd0fb68f..1cf18d46e761 100644 --- a/libs/x-content/build.gradle +++ b/libs/x-content/build.gradle @@ -12,14 +12,14 @@ apply plugin: 'elasticsearch.publish' apply plugin: 'elasticsearch.embedded-providers' embeddedProviders { - impl 'x-content', project(':libs:elasticsearch-x-content:impl') + impl 'x-content', project(':libs:x-content:impl') } dependencies { - api project(':libs:elasticsearch-core') + api project(':libs:core') testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-x-content' + exclude group: 'org.elasticsearch', module: 'x-content' } } diff --git a/libs/x-content/impl/build.gradle b/libs/x-content/impl/build.gradle index 753d2c3d5fe1..35e122d336c6 100644 --- a/libs/x-content/impl/build.gradle +++ b/libs/x-content/impl/build.gradle @@ -16,8 +16,8 @@ base { String jacksonVersion = "2.17.2" dependencies { - compileOnly project(':libs:elasticsearch-core') - compileOnly project(':libs:elasticsearch-x-content') + compileOnly project(':libs:core') + compileOnly project(':libs:x-content') implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jacksonVersion}" implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}" @@ -25,7 +25,7 @@ dependencies { implementation "org.yaml:snakeyaml:${versions.snakeyaml}" testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-x-content' + exclude group: 'org.elasticsearch', module: 'x-content' } } diff --git a/modules/ingest-common/build.gradle b/modules/ingest-common/build.gradle index 98dacce01fba..7cfdba4d3374 100644 --- a/modules/ingest-common/build.gradle +++ b/modules/ingest-common/build.gradle @@ -20,8 +20,8 @@ esplugin { dependencies { compileOnly project(':modules:lang-painless:spi') - api project(':libs:elasticsearch-grok') - api project(':libs:elasticsearch-dissect') + api project(':libs:grok') + api project(':libs:dissect') implementation "org.apache.httpcomponents:httpclient:${versions.httpclient}" implementation "org.apache.httpcomponents:httpcore:${versions.httpcore}" } diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle index ac68b565a0fb..14a6b1e3f5b8 100644 --- a/modules/reindex/build.gradle +++ b/modules/reindex/build.gradle @@ -38,7 +38,7 @@ testClusters.configureEach { dependencies { api project(":client:rest") - api project(":libs:elasticsearch-ssl-config") + api project(":libs:ssl-config") // for parent/child testing testImplementation project(':modules:parent-join') testImplementation project(':modules:rest-root') diff --git a/modules/runtime-fields-common/build.gradle b/modules/runtime-fields-common/build.gradle index 00bb17df8665..e743939cbf79 100644 --- a/modules/runtime-fields-common/build.gradle +++ b/modules/runtime-fields-common/build.gradle @@ -19,8 +19,8 @@ esplugin { dependencies { compileOnly project(':modules:lang-painless:spi') - api project(':libs:elasticsearch-grok') - api project(':libs:elasticsearch-dissect') + api project(':libs:grok') + api project(':libs:dissect') } tasks.named("yamlRestCompatTestTransform").configure({ task -> diff --git a/modules/systemd/build.gradle b/modules/systemd/build.gradle index 28fd36160936..8eb48e1d5f63 100644 --- a/modules/systemd/build.gradle +++ b/modules/systemd/build.gradle @@ -13,6 +13,6 @@ esplugin { } dependencies { - implementation project(':libs:elasticsearch-native') + implementation project(':libs:native') } diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index d80b63bec53d..8dc718a818ce 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -35,7 +35,7 @@ configurations { } dependencies { - api project(":libs:elasticsearch-ssl-config") + api project(":libs:ssl-config") // network stack api "io.netty:netty-buffer:${versions.netty}" @@ -244,4 +244,4 @@ tasks.named("thirdPartyAudit").configure { tasks.named('forbiddenApisMain').configure { signaturesFiles += files('forbidden/netty-signatures.txt') -} \ No newline at end of file +} diff --git a/qa/logging-config/build.gradle b/qa/logging-config/build.gradle index 78da8590660f..4d65c4384afa 100644 --- a/qa/logging-config/build.gradle +++ b/qa/logging-config/build.gradle @@ -10,7 +10,7 @@ apply plugin: 'elasticsearch.build' apply plugin: 'elasticsearch.legacy-java-rest-test' dependencies { - testImplementation project(":libs:elasticsearch-x-content") + testImplementation project(":libs:x-content") testImplementation project(":test:framework") } diff --git a/qa/packaging/build.gradle b/qa/packaging/build.gradle index 73b650749018..f9a903223c88 100644 --- a/qa/packaging/build.gradle +++ b/qa/packaging/build.gradle @@ -13,7 +13,7 @@ plugins { dependencies { testImplementation project(':server') - testImplementation project(':libs:elasticsearch-core') + testImplementation project(':libs:core') testImplementation(testArtifact(project(':x-pack:plugin:core'))) testImplementation "junit:junit:${versions.junit}" testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}" diff --git a/server/build.gradle b/server/build.gradle index 963b3cfb2e74..e8493751cb32 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -28,17 +28,17 @@ base { dependencies { - api project(':libs:elasticsearch-core') - api project(':libs:elasticsearch-logging') - api project(':libs:elasticsearch-secure-sm') - api project(':libs:elasticsearch-x-content') - api project(":libs:elasticsearch-geo") - api project(":libs:elasticsearch-lz4") - api project(":libs:elasticsearch-plugin-api") - api project(":libs:elasticsearch-plugin-analysis-api") - api project(':libs:elasticsearch-grok') - api project(":libs:elasticsearch-tdigest") - implementation project(":libs:elasticsearch-simdvec") + api project(':libs:core') + api project(':libs:logging') + api project(':libs:secure-sm') + api project(':libs:x-content') + api project(":libs:geo") + api project(":libs:lz4") + api project(":libs:plugin-api") + api project(":libs:plugin-analysis-api") + api project(':libs:grok') + api project(":libs:tdigest") + implementation project(":libs:simdvec") // lucene api "org.apache.lucene:lucene-core:${versions.lucene}" @@ -56,7 +56,7 @@ dependencies { api "org.apache.lucene:lucene-suggest:${versions.lucene}" // utilities - api project(":libs:elasticsearch-cli") + api project(":libs:cli") implementation 'com.carrotsearch:hppc:0.8.1' // precentil ranks aggregation @@ -67,7 +67,7 @@ dependencies { api "org.apache.logging.log4j:log4j-core:${versions.log4j}" // access to native functions - implementation project(':libs:elasticsearch-native') + implementation project(':libs:native') api "co.elastic.logging:log4j2-ecs-layout:${versions.ecsLogging}" api "co.elastic.logging:ecs-logging-core:${versions.ecsLogging}" diff --git a/settings.gradle b/settings.gradle index 39453e8d0935..25ed048d5725 100644 --- a/settings.gradle +++ b/settings.gradle @@ -155,17 +155,7 @@ addSubProjects('', new File(rootProject.projectDir, 'x-pack/libs')) include projects.toArray(new String[0]) -project(":libs").children.each { libsProject -> - libsProject.name = "elasticsearch-${libsProject.name}" - libsProject.children.each { lp -> - lp.name = lp.name // for :libs:elasticsearch-x-content:impl - } -} -project(":libs:elasticsearch-native:libraries").name = "elasticsearch-native-libraries" - -project(":qa:stable-api").children.each { libsProject -> - libsProject.name = "elasticsearch-${libsProject.name}" -} +project(":libs:native:libraries").name = "native-libraries" project(":test:external-modules").children.each { testProject -> testProject.name = "test-${testProject.name}" diff --git a/test/external-modules/apm-integration/build.gradle b/test/external-modules/apm-integration/build.gradle index 98090f33ee2c..d0f5f889e9b3 100644 --- a/test/external-modules/apm-integration/build.gradle +++ b/test/external-modules/apm-integration/build.gradle @@ -22,5 +22,5 @@ tasks.named('javaRestTest').configure { dependencies { clusterModules project(':modules:apm') - implementation project(':libs:elasticsearch-logging') + implementation project(':libs:logging') } diff --git a/test/fixtures/geoip-fixture/build.gradle b/test/fixtures/geoip-fixture/build.gradle index f20db481814e..13d2b6ae88e9 100644 --- a/test/fixtures/geoip-fixture/build.gradle +++ b/test/fixtures/geoip-fixture/build.gradle @@ -13,8 +13,8 @@ description = 'Fixture for GeoIPv2 service' dependencies { api project(':server') api project(':distribution:tools:geoip-cli') - api project(":libs:elasticsearch-cli") - api project(":libs:elasticsearch-x-content") + api project(":libs:cli") + api project(":libs:x-content") api("junit:junit:${versions.junit}") { exclude module: 'hamcrest-core' } diff --git a/test/framework/build.gradle b/test/framework/build.gradle index 72a8eade3bce..f130ecf13184 100644 --- a/test/framework/build.gradle +++ b/test/framework/build.gradle @@ -14,9 +14,9 @@ apply plugin: 'elasticsearch.publish' dependencies { api project(":client:rest") api project(':modules:transport-netty4') - api project(':libs:elasticsearch-ssl-config') + api project(':libs:ssl-config') api project(":server") - api project(":libs:elasticsearch-cli") + api project(":libs:cli") api "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" api "junit:junit:${versions.junit}" api "org.hamcrest:hamcrest:${versions.hamcrest}" diff --git a/test/x-content/build.gradle b/test/x-content/build.gradle index 48667eeb5873..281148a0fe81 100644 --- a/test/x-content/build.gradle +++ b/test/x-content/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'elasticsearch.publish' dependencies { api project(":test:framework") - api project(":libs:elasticsearch-x-content") + api project(":libs:x-content") // json schema validation dependencies implementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" diff --git a/x-pack/plugin/blob-cache/build.gradle b/x-pack/plugin/blob-cache/build.gradle index ff21b64def76..c5c91a5ef87e 100644 --- a/x-pack/plugin/blob-cache/build.gradle +++ b/x-pack/plugin/blob-cache/build.gradle @@ -15,5 +15,5 @@ esplugin { } dependencies { - compileOnly project(path: ':libs:elasticsearch-native') + compileOnly project(path: ':libs:native') } diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle index 1ed59d6fe358..fb4acb0055a8 100644 --- a/x-pack/plugin/core/build.gradle +++ b/x-pack/plugin/core/build.gradle @@ -36,8 +36,8 @@ configurations { dependencies { compileOnly project(":server") - api project(':libs:elasticsearch-grok') - api project(":libs:elasticsearch-ssl-config") + api project(':libs:grok') + api project(":libs:ssl-config") api "org.apache.httpcomponents:httpclient:${versions.httpclient}" api "org.apache.httpcomponents:httpcore:${versions.httpcore}" api "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}" diff --git a/x-pack/plugin/esql/build.gradle b/x-pack/plugin/esql/build.gradle index 766d0c0f1389..150017ce9e95 100644 --- a/x-pack/plugin/esql/build.gradle +++ b/x-pack/plugin/esql/build.gradle @@ -26,8 +26,8 @@ dependencies { compileOnly project(xpackModule('ml')) implementation project('compute') implementation project('compute:ann') - implementation project(':libs:elasticsearch-dissect') - implementation project(':libs:elasticsearch-grok') + implementation project(':libs:dissect') + implementation project(':libs:grok') implementation project('arrow') // Also contains a dummy processor to allow compilation with unused annotations. diff --git a/x-pack/plugin/esql/qa/testFixtures/build.gradle b/x-pack/plugin/esql/qa/testFixtures/build.gradle index b6ed61040663..903986466b77 100644 --- a/x-pack/plugin/esql/qa/testFixtures/build.gradle +++ b/x-pack/plugin/esql/qa/testFixtures/build.gradle @@ -5,9 +5,9 @@ dependencies { implementation project(':x-pack:plugin:esql:compute') implementation project(':x-pack:plugin:esql') compileOnly project(path: xpackModule('core')) - implementation project(":libs:elasticsearch-x-content") + implementation project(":libs:x-content") implementation project(':client:rest') - implementation project(':libs:elasticsearch-logging') + implementation project(':libs:logging') implementation project(':test:framework') api(testArtifact(project(xpackModule('esql-core')))) implementation project(':server') diff --git a/x-pack/plugin/inference/build.gradle b/x-pack/plugin/inference/build.gradle index 28e1405cf7b9..6791aad6619d 100644 --- a/x-pack/plugin/inference/build.gradle +++ b/x-pack/plugin/inference/build.gradle @@ -32,7 +32,7 @@ versions << [ ] dependencies { - implementation project(path: ':libs:elasticsearch-logging') + implementation project(path: ':libs:logging') compileOnly project(":server") compileOnly project(path: xpackModule('core')) testImplementation(testArtifact(project(xpackModule('core')))) diff --git a/x-pack/plugin/ml-package-loader/build.gradle b/x-pack/plugin/ml-package-loader/build.gradle index bdd1e54f20c8..122ad396b507 100644 --- a/x-pack/plugin/ml-package-loader/build.gradle +++ b/x-pack/plugin/ml-package-loader/build.gradle @@ -18,7 +18,7 @@ esplugin { } dependencies { - implementation project(path: ':libs:elasticsearch-logging') + implementation project(path: ':libs:logging') compileOnly project(":server") compileOnly project(path: xpackModule('core')) testImplementation(testArtifact(project(xpackModule('core')))) diff --git a/x-pack/plugin/ml/build.gradle b/x-pack/plugin/ml/build.gradle index 706d7ea73aea..e79a77129339 100644 --- a/x-pack/plugin/ml/build.gradle +++ b/x-pack/plugin/ml/build.gradle @@ -76,7 +76,7 @@ dependencies { testImplementation(testArtifact(project(xpackModule('security')))) testImplementation project(path: xpackModule('wildcard')) // ml deps - api project(':libs:elasticsearch-grok') + api project(':libs:grok') api project(':modules:lang-mustache') api "org.apache.commons:commons-math3:3.6.1" api "com.ibm.icu:icu4j:${versions.icu4j}" diff --git a/x-pack/plugin/searchable-snapshots/build.gradle b/x-pack/plugin/searchable-snapshots/build.gradle index 4e309499445e..747e94b0e8d8 100644 --- a/x-pack/plugin/searchable-snapshots/build.gradle +++ b/x-pack/plugin/searchable-snapshots/build.gradle @@ -15,7 +15,7 @@ base { dependencies { compileOnly project(path: xpackModule('core')) compileOnly project(path: xpackModule('blob-cache')) - compileOnly project(path: ':libs:elasticsearch-native') + compileOnly project(path: ':libs:native') testImplementation(testArtifact(project(xpackModule('blob-cache')))) internalClusterTestImplementation(testArtifact(project(xpackModule('core')))) internalClusterTestImplementation(project(path: xpackModule('shutdown'))) diff --git a/x-pack/plugin/spatial/build.gradle b/x-pack/plugin/spatial/build.gradle index e11194972484..5bcec68c227c 100644 --- a/x-pack/plugin/spatial/build.gradle +++ b/x-pack/plugin/spatial/build.gradle @@ -15,7 +15,7 @@ dependencies { compileOnly project(':modules:lang-painless:spi') compileOnly project(path: xpackModule('core')) api "org.apache.lucene:lucene-spatial3d:${versions.lucene}" - api project(":libs:elasticsearch-h3") + api project(":libs:h3") testImplementation(testArtifact(project(xpackModule('core')))) testImplementation project(path: ':modules:percolator') testImplementation project(path: xpackModule('vector-tile')) diff --git a/x-pack/plugin/sql/sql-action/build.gradle b/x-pack/plugin/sql/sql-action/build.gradle index 9a0aefac4e43..60e809df00ae 100644 --- a/x-pack/plugin/sql/sql-action/build.gradle +++ b/x-pack/plugin/sql/sql-action/build.gradle @@ -11,10 +11,10 @@ dependencies { api(project(':server')) { transitive = false } - api(project(':libs:elasticsearch-core')) { + api(project(':libs:core')) { transitive = false } - api(project(':libs:elasticsearch-x-content')) { + api(project(':libs:x-content')) { transitive = false } api project(':x-pack:plugin:core') @@ -33,4 +33,4 @@ tasks.named('forbiddenApisMain').configure { tasks.named("dependencyLicenses").configure { mapping from: /jackson-.*/, to: 'jackson' mapping from: /lucene-.*/, to: 'lucene' -} \ No newline at end of file +} diff --git a/x-pack/plugin/sql/sql-cli/build.gradle b/x-pack/plugin/sql/sql-cli/build.gradle index 1d3a63ec13c9..b9713bcb8e7a 100644 --- a/x-pack/plugin/sql/sql-cli/build.gradle +++ b/x-pack/plugin/sql/sql-cli/build.gradle @@ -29,7 +29,7 @@ dependencies { api "org.jline:jline-style:${jlineVersion}" api project(':x-pack:plugin:sql:sql-client') - api project(":libs:elasticsearch-cli") + api project(":libs:cli") implementation "net.java.dev.jna:jna:${versions.jna}" testImplementation project(":test:framework") } diff --git a/x-pack/plugin/sql/sql-proto/build.gradle b/x-pack/plugin/sql/sql-proto/build.gradle index de3f3462da85..2cb1cfa89f03 100644 --- a/x-pack/plugin/sql/sql-proto/build.gradle +++ b/x-pack/plugin/sql/sql-proto/build.gradle @@ -10,9 +10,9 @@ dependencies { api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}" - testImplementation project(":libs:elasticsearch-x-content") + testImplementation project(":libs:x-content") testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-x-content' + exclude group: 'org.elasticsearch', module: 'x-content' } } diff --git a/x-pack/plugin/text-structure/build.gradle b/x-pack/plugin/text-structure/build.gradle index cab7f3ceeaa1..5bb6d8ef5027 100644 --- a/x-pack/plugin/text-structure/build.gradle +++ b/x-pack/plugin/text-structure/build.gradle @@ -12,7 +12,7 @@ base { dependencies { compileOnly project(path: xpackModule('core')) testImplementation(testArtifact(project(xpackModule('core')))) - api project(':libs:elasticsearch-grok') + api project(':libs:grok') api "com.ibm.icu:icu4j:${versions.icu4j}" api "net.sf.supercsv:super-csv:${versions.supercsv}" } diff --git a/x-pack/plugin/transform/qa/common/build.gradle b/x-pack/plugin/transform/qa/common/build.gradle index 9e7abfa2f977..28e4068d31c6 100644 --- a/x-pack/plugin/transform/qa/common/build.gradle +++ b/x-pack/plugin/transform/qa/common/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'elasticsearch.internal-java-rest-test' dependencies { - api project(':libs:elasticsearch-x-content') + api project(':libs:x-content') api project(':test:framework') api project(xpackModule('core')) }