Make use of new layout.settingsFolder api to address some cross project references

breskeby · breskeby · commit 35fecc5dadd2 · 2025-02-26T16:54:49.000+01:00
diff --git a/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/distribution/archives/build.gradle b/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/distribution/archives/build.gradle
@@ -34,7 +34,7 @@ subprojects {
 }
 
 def calculateBranchVersion() {
-    File f = rootProject.file(".git/refs/heads/origin")
+    File f = layout.settingsDirectory.file(".git/refs/heads/origin").asFile
     def branchName = f.list()?.first().trim()
     return branchName + ".1"
 
diff --git a/client/rest/build.gradle b/client/rest/build.gradle
@@ -37,7 +37,7 @@ base {
 
 // LLRC is licenses under Apache 2.0
 projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
-licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
+licenseFile.set(layout.getSettingsDirectory().file('licenses/APACHE-LICENSE-2.0.txt').asFile)
 
 dependencies {
   api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
diff --git a/client/sniffer/build.gradle b/client/sniffer/build.gradle
@@ -33,7 +33,7 @@ base {
 
 // rest client sniffer is licenses under Apache 2.0
 projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
-licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
+licenseFile.set(layout.getSettingsDirectory().file('licenses/APACHE-LICENSE-2.0.txt').asFile)
 
 dependencies {
   api project(":client:rest")
diff --git a/client/test/build.gradle b/client/test/build.gradle
@@ -19,7 +19,7 @@ group = "${group}.client.test"
 
 // rest client sniffer is licenses under Apache 2.0
 projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
-licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
+licenseFile.set(layout.getSettingsDirectory().file('licenses/APACHE-LICENSE-2.0.txt').asFile)
 
 dependencies {
   api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle
@@ -57,13 +57,13 @@ CopySpec archiveFiles(String distributionType, String os, String architecture, b
           pluginsDir.getParent()
         }
       }
-      from(rootProject.projectDir) {
+      from(layout.settingsDirectory.asFile) {
         filePermissions {
           unix(0644)
         }
         include 'README.asciidoc'
       }
-      from(rootProject.file('licenses')) {
+      from(layout.settingsDirectory.file('licenses').asFile) {
         include isTestDistro ? 'AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt' : 'ELASTIC-LICENSE-2.0.txt'
         filePermissions {
           unix(0644)
diff --git a/distribution/build.gradle b/distribution/build.gradle
@@ -518,9 +518,9 @@ subprojects {
 
     String licenseText
     if (isTestDistro) {
-      licenseText = rootProject.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').getText('UTF-8')
+      licenseText = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile.getText('UTF-8')
     } else {
-      licenseText = rootProject.file('licenses/ELASTIC-LICENSE-2.0.txt').getText('UTF-8')
+      licenseText = layout.settingsDirectory.file('licenses/ELASTIC-LICENSE-2.0.txt').asFile.getText('UTF-8')
     }
     // license text needs to be indented with a single space
     licenseText = ' ' + licenseText.replace('\n', '\n ')
diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle
@@ -174,7 +174,7 @@ def commonPackageConfig(String type, String architecture) {
     } else {
       assert type == 'rpm'
       into('/usr/share/elasticsearch') {
-        from(rootProject.file('licenses')) {
+        from(layout.settingsDirectory.file('licenses').asFile) {
           include 'ELASTIC-LICENSE-2.0.txt'
           rename { 'LICENSE.txt' }
         }
diff --git a/libs/h3/build.gradle b/libs/h3/build.gradle
@@ -36,7 +36,7 @@ tasks.named('forbiddenApisMain').configure {
 }
 
 ext.projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
-licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
+licenseFile.set(layout.settingsDirectory.file('licenses/APACHE-LICENSE-2.0.txt').asFile)
 
 tasks.withType(LicenseHeadersTask.class).configureEach {
   approvedLicenses = ['Apache', 'Generated', 'Vendored']
diff --git a/libs/tdigest/build.gradle b/libs/tdigest/build.gradle
@@ -37,7 +37,7 @@ tasks.named('forbiddenApisMain').configure {
 }
 
 ext.projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
-licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
+licenseFile.set(layout.settingsDirectory.file('licenses/APACHE-LICENSE-2.0.txt').asFile)
 
 tasks.withType(LicenseHeadersTask.class).configureEach {
   approvedLicenses = ['Apache', 'Generated', 'Vendored']
diff --git a/plugins/build.gradle b/plugins/build.gradle
@@ -23,11 +23,9 @@ 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
-
-    licenseFile = rootProject.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-    noticeFile = rootProject.file('NOTICE.txt')
+    licenseFile = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+    noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
   }
 
-
   parent.artifacts.add('allPlugins', tasks.named('bundlePlugin'))
 }
diff --git a/plugins/examples/custom-processor/build.gradle b/plugins/examples/custom-processor/build.gradle
@@ -13,8 +13,8 @@ esplugin {
   name = 'custom-processor'
   description = 'An example plugin showing how to register a custom ingest processor'
   classname ='org.elasticsearch.example.customprocessor.ExampleProcessorPlugin'
-  licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-  noticeFile = rootProject.file('NOTICE.txt')
+  licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+  noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
 }
 
 dependencies {
diff --git a/plugins/examples/custom-settings/build.gradle b/plugins/examples/custom-settings/build.gradle
@@ -13,8 +13,8 @@ esplugin {
   name = 'custom-settings'
   description = 'An example plugin showing how to register custom settings'
   classname ='org.elasticsearch.example.customsettings.ExampleCustomSettingsPlugin'
-  licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-  noticeFile = rootProject.file('NOTICE.txt')
+  licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+  noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
 }
 
 testClusters.configureEach {
diff --git a/plugins/examples/custom-significance-heuristic/build.gradle b/plugins/examples/custom-significance-heuristic/build.gradle
@@ -13,8 +13,8 @@ esplugin {
   name = 'custom-significance-heuristic'
   description = 'An example plugin showing how to write and register a custom significance heuristic'
   classname ='org.elasticsearch.example.customsigheuristic.CustomSignificanceHeuristicPlugin'
-  licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-  noticeFile = rootProject.file('NOTICE.txt')
+  licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+  noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
 }
 
 dependencies {
diff --git a/plugins/examples/custom-suggester/build.gradle b/plugins/examples/custom-suggester/build.gradle
@@ -13,8 +13,8 @@ esplugin {
   name = 'custom-suggester'
   description = 'An example plugin showing how to write and register a custom suggester'
   classname ='org.elasticsearch.example.customsuggester.CustomSuggesterPlugin'
-  licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-  noticeFile = rootProject.file('NOTICE.txt')
+  licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+  noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
 }
 
 testClusters.configureEach {
diff --git a/plugins/examples/painless-whitelist/build.gradle b/plugins/examples/painless-whitelist/build.gradle
@@ -14,8 +14,8 @@ esplugin {
   description = 'An example whitelisting additional classes and methods in painless'
   classname ='org.elasticsearch.example.painlesswhitelist.MyWhitelistPlugin'
   extendedPlugins = ['lang-painless']
-  licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-  noticeFile = rootProject.file('NOTICE.txt')
+  licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+  noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
 }
 
 dependencies {
diff --git a/plugins/examples/rescore/build.gradle b/plugins/examples/rescore/build.gradle
@@ -13,8 +13,8 @@ esplugin {
   name = 'example-rescore'
   description = 'An example plugin implementing rescore and verifying that plugins *can* implement rescore'
   classname ='org.elasticsearch.example.rescore.ExampleRescorePlugin'
-  licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-  noticeFile = rootProject.file('NOTICE.txt')
+  licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+  noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
 }
 
 dependencies {
diff --git a/plugins/examples/rest-handler/build.gradle b/plugins/examples/rest-handler/build.gradle
@@ -13,8 +13,8 @@ esplugin {
   name = 'rest-handler'
   description = 'An example plugin showing how to register a REST handler'
   classname ='org.elasticsearch.example.resthandler.ExampleRestHandlerPlugin'
-  licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-  noticeFile = rootProject.file('NOTICE.txt')
+  licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+  noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
 }
 
 dependencies {
diff --git a/plugins/examples/script-expert-scoring/build.gradle b/plugins/examples/script-expert-scoring/build.gradle
@@ -13,8 +13,8 @@ esplugin {
   name = 'script-expert-scoring'
   description = 'An example script engine to use low level Lucene internals for expert scoring'
   classname ='org.elasticsearch.example.expertscript.ExpertScriptPlugin'
-  licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-  noticeFile = rootProject.file('NOTICE.txt')
+  licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+  noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
 }
 
 dependencies {
diff --git a/plugins/examples/security-authorization-engine/build.gradle b/plugins/examples/security-authorization-engine/build.gradle
@@ -6,8 +6,8 @@ esplugin {
   description = 'An example spi extension plugin for security that implements an Authorization Engine'
   classname ='org.elasticsearch.example.AuthorizationEnginePlugin'
   extendedPlugins = ['x-pack-security']
-  licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-  noticeFile = rootProject.file('NOTICE.txt')
+  licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+  noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
 }
 
 dependencies {
diff --git a/qa/system-indices/build.gradle b/qa/system-indices/build.gradle
@@ -14,8 +14,8 @@ esplugin {
   name = 'system-indices-qa'
   description = 'Plugin for performing QA of system indices'
   classname ='org.elasticsearch.system.indices.SystemIndicesQA'
-  licenseFile = rootProject.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-  noticeFile = rootProject.file('NOTICE.txt')
+  licenseFile = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+  noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
 }
 
 testClusters.configureEach {
diff --git a/qa/verify-version-constants/build.gradle b/qa/verify-version-constants/build.gradle
@@ -38,7 +38,7 @@ buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName ->
 
 tasks.register("verifyDocsLuceneVersion") {
   doFirst {
-    File docsVersionsFile = rootProject.file('docs/Versions.asciidoc')
+    File docsVersionsFile = layout.settingsDirectory.file('docs/Versions.asciidoc').asFile
     List<String> versionLines = docsVersionsFile.readLines('UTF-8')
     String docsLuceneVersion = null
     for (String line : versionLines) {
diff --git a/rest-api-spec/build.gradle b/rest-api-spec/build.gradle
@@ -14,7 +14,7 @@ restResources {
 
 // REST API specifications are published under the Apache 2.0 License
 ext.projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
-licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
+licenseFile.set(layout.settingsDirectory.file('licenses/APACHE-LICENSE-2.0.txt').asFile)
 
 configurations {
   // configuration to make use by external yaml rest test plugin in our examples
diff --git a/test/external-modules/build.gradle b/test/external-modules/build.gradle
@@ -12,7 +12,7 @@ subprojects {
 
   esplugin {
     name = it.name
-    licenseFile = rootProject.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
-    noticeFile = rootProject.file('NOTICE.txt')
+    licenseFile = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
+    noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
   }
 }
diff --git a/x-pack/build.gradle b/x-pack/build.gradle
@@ -26,7 +26,7 @@ subprojects {
   ext.xpackModule = { String moduleName -> ":x-pack:plugin:${moduleName}" }
 
   plugins.withType(PluginBuildPlugin).whenPluginAdded {
-    project.esplugin.licenseFile = rootProject.file('licenses/ELASTIC-LICENSE-2.0.txt')
+    project.esplugin.licenseFile = layout.settingsDirectory.file('licenses/ELASTIC-LICENSE-2.0.txt').asFile
     project.esplugin.noticeFile = xpackRootProject.file('NOTICE.txt')
   }
 
@@ -40,7 +40,7 @@ subprojects {
   }
 
   project.pluginManager.withPlugin("elasticsearch.build") {
-    project.ext.licenseFile.set(rootProject.file('licenses/ELASTIC-LICENSE-2.0.txt'))
+    project.ext.licenseFile.set(layout.settingsDirectory.file('licenses/ELASTIC-LICENSE-2.0.txt').asFile)
     project.ext.noticeFile.set(xpackRootProject.file('NOTICE.txt'))
   }
 }
diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle
@@ -104,7 +104,7 @@ tasks.named("processResources").configure {
   } else {
     throw new IllegalArgumentException('Property license.key must be set for release build')
   }
-  File licenseKeyFile = rootProject.file(licenseKey)
+  File licenseKeyFile = layout.settingsDirectory.file(licenseKey).asFile
   if (licenseKeyFile.exists() == false) {
     throw new IllegalArgumentException('license.key at specified path [' + licenseKey + '] does not exist')
   }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ subprojects {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`def calculateBranchVersion() {`
`37`		`- File f = rootProject.file(".git/refs/heads/origin")`
	`37`	`+ File f = layout.settingsDirectory.file(".git/refs/heads/origin").asFile`
`38`	`38`	`def branchName = f.list()?.first().trim()`
`39`	`39`	`return branchName + ".1"`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,13 @@ CopySpec archiveFiles(String distributionType, String os, String architecture, b`
`57`	`57`	`pluginsDir.getParent()`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`- from(rootProject.projectDir) {`
	`60`	`+ from(layout.settingsDirectory.asFile) {`
`61`	`61`	`filePermissions {`
`62`	`62`	`unix(0644)`
`63`	`63`	`}`
`64`	`64`	`include 'README.asciidoc'`
`65`	`65`	`}`
`66`		`- from(rootProject.file('licenses')) {`
	`66`	`+ from(layout.settingsDirectory.file('licenses').asFile) {`
`67`	`67`	`include isTestDistro ? 'AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt' : 'ELASTIC-LICENSE-2.0.txt'`
`68`	`68`	`filePermissions {`
`69`	`69`	`unix(0644)`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ def commonPackageConfig(String type, String architecture) {`
`174`	`174`	`} else {`
`175`	`175`	`assert type == 'rpm'`
`176`	`176`	`into('/usr/share/elasticsearch') {`
`177`		`- from(rootProject.file('licenses')) {`
	`177`	`+ from(layout.settingsDirectory.file('licenses').asFile) {`
`178`	`178`	`include 'ELASTIC-LICENSE-2.0.txt'`
`179`	`179`	`rename { 'LICENSE.txt' }`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ tasks.named('forbiddenApisMain').configure {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`ext.projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])`
`39`		`-licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))`
	`39`	`+licenseFile.set(layout.settingsDirectory.file('licenses/APACHE-LICENSE-2.0.txt').asFile)`
`40`	`40`
`41`	`41`	`tasks.withType(LicenseHeadersTask.class).configureEach {`
`42`	`42`	`approvedLicenses = ['Apache', 'Generated', 'Vendored']`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ tasks.named('forbiddenApisMain').configure {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`ext.projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])`
`40`		`-licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))`
	`40`	`+licenseFile.set(layout.settingsDirectory.file('licenses/APACHE-LICENSE-2.0.txt').asFile)`
`41`	`41`
`42`	`42`	`tasks.withType(LicenseHeadersTask.class).configureEach {`
`43`	`43`	`approvedLicenses = ['Apache', 'Generated', 'Vendored']`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,9 @@ configure(subprojects.findAll { it.parent.path == project.path }) {`
`23`	`23`	`esplugin {`
`24`	`24`	`// for local ES plugins, the name of the plugin is the same as the directory`
`25`	`25`	`name = project.name`
`26`		`-`
`27`		`- licenseFile = rootProject.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')`
`28`		`- noticeFile = rootProject.file('NOTICE.txt')`
	`26`	`+ licenseFile = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile`
	`27`	`+ noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile`
`29`	`28`	`}`
`30`	`29`
`31`		`-`
`32`	`30`	`parent.artifacts.add('allPlugins', tasks.named('bundlePlugin'))`
`33`	`31`	`}`