Always use "elasticsearch" as Gradle project name (#65709)

This commit is contained in:
Mark Vieira 2020-12-02 09:27:24 -08:00 committed by GitHub
parent a1b6be045c
commit 8dc71c34b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,8 +2,7 @@ plugins {
id "com.gradle.enterprise" version "3.5" id "com.gradle.enterprise" version "3.5"
} }
String dirName = rootProject.projectDir.name rootProject.name = "elasticsearch"
rootProject.name = dirName
List projects = [ List projects = [
'build-tools', 'build-tools',
@ -135,7 +134,7 @@ project(":test:external-modules").children.each { testProject ->
} }
// look for extra plugins for elasticsearch // look for extra plugins for elasticsearch
File extraProjects = new File(rootProject.projectDir.parentFile, "${dirName}-extra") File extraProjects = new File(rootProject.projectDir.parentFile, "${rootProject.projectDir.name}-extra")
if (extraProjects.exists()) { if (extraProjects.exists()) {
for (File extraProjectDir : extraProjects.listFiles()) { for (File extraProjectDir : extraProjects.listFiles()) {
addSubProjects('', extraProjectDir) addSubProjects('', extraProjectDir)