diff --git a/distribution/build.gradle b/distribution/build.gradle index c1ab5b76148b3..266cb8f8b270a 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -312,6 +312,22 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) { task run(type: RunTask) { distribution = System.getProperty('run.distribution', 'zip') + if (distribution == 'zip') { + String licenseType = System.getProperty("license_type", "basic") + if (licenseType == 'trial') { + setting 'xpack.ml.enabled', 'true' + setting 'xpack.graph.enabled', 'true' + setting 'xpack.watcher.enabled', 'true' + setting 'xpack.license.self_generated.type', 'trial' + } else if (licenseType != 'basic') { + throw new IllegalArgumentException("Unsupported self-generated license type: [" + licenseType + "[basic] or [trial].") + } + setting 'xpack.security.enabled', 'true' + setting 'xpack.monitoring.enabled', 'true' + setting 'xpack.sql.enabled', 'true' + setting 'xpack.rollup.enabled', 'true' + keystoreSetting 'bootstrap.password', 'password' + } } /** diff --git a/x-pack/plugin/build.gradle b/x-pack/plugin/build.gradle index 110b26182ad8e..e4dc314eb72a7 100644 --- a/x-pack/plugin/build.gradle +++ b/x-pack/plugin/build.gradle @@ -158,21 +158,3 @@ integTestCluster { return tmpFile.exists() } } - -run { - def licenseType = System.getProperty("license_type", "basic") - if (licenseType == 'trial') { - setting 'xpack.ml.enabled', 'true' - setting 'xpack.graph.enabled', 'true' - setting 'xpack.watcher.enabled', 'true' - setting 'xpack.license.self_generated.type', 'trial' - } else if (licenseType != 'basic') { - throw new IllegalArgumentException("Unsupported self-generated license type: [" + licenseType + "]. Must be " + - "[basic] or [trial].") - } - setting 'xpack.security.enabled', 'true' - setting 'xpack.monitoring.enabled', 'true' - setting 'xpack.sql.enabled', 'true' - setting 'xpack.rollup.enabled', 'true' - keystoreSetting 'bootstrap.password', 'password' -}