This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch branch_10_1 in repository https://gitbox.apache.org/repos/asf/solr.git
commit b718b00431515c4d815446ea7b54d68e3c7818a1 Author: David Smiley <[email protected]> AuthorDate: Mon Sep 28 17:20:47 2026 -0400 build: Restore disableUiModule gate (#4947) (small regression of a build feature) (cherry picked from commit 291ea14491fd1c00baffdf7bcd56a9f1f127c8bc) --- settings.gradle | 3 +++ solr/webapp/build.gradle | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/settings.gradle b/settings.gradle index 615bba1a2b6..1099ea395cd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -72,5 +72,8 @@ if (gradle.ext.withJsClient) { include(":solr:webapp:js-client") } +def disableUiModuleValue = providers.gradleProperty('disableUiModule').orNull +gradle.ext.withUiModule = disableUiModuleValue == null || disableUiModuleValue != 'true' + // Configures development for joint Lucene/ Solr composite build. apply from: file('gradle/lucene-dev/lucene-dev-repo-composite.gradle') diff --git a/solr/webapp/build.gradle b/solr/webapp/build.gradle index 02b60ad323c..bda5765b6d4 100644 --- a/solr/webapp/build.gradle +++ b/solr/webapp/build.gradle @@ -20,7 +20,9 @@ plugins { id 'war' } -apply from: "$rootDir/gradle/solr/solr-ui.gradle" +if (gradle.ext.withUiModule) { + apply from: "$rootDir/gradle/solr/solr-ui.gradle" +} description = 'Solr webapp' @@ -52,7 +54,9 @@ dependencies { if (gradle.ext.withJsClient) { generatedJSClientBundle project(path: ":solr:webapp:js-client", configuration: "jsClientBundle") } - uiBundle files(layout.buildDirectory.dir("generated/ui-resources")) { builtBy tasks.named('prepareUiResources') } + if (gradle.ext.withUiModule) { + uiBundle files(layout.buildDirectory.dir("generated/ui-resources")) { builtBy tasks.named('prepareUiResources') } + } // Browser-based tests of the AngularJS Admin UI (see src/test) testImplementation project(':solr:core')
