From 29e0b98cac4c1b739f4bfd3eef4f842e49418681 Mon Sep 17 00:00:00 2001 From: Michael Basnight Date: Tue, 13 Feb 2018 07:15:44 -0600 Subject: [PATCH] Remove snapshot conditional for bwc snapshots The build.snapshot flag used by the main build was being propagated down into the bwc snapshot builds, which is not correct. The bwc subprojects are always meant to be snapshot builds, or null if they do not exist. Marking these builds as non snapshots threw the release off as it was looking for -SNAPSHOT builds. Relates #28641 --- distribution/bwc/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle index 5284d7674a1b3..0387204067a58 100644 --- a/distribution/bwc/build.gradle +++ b/distribution/bwc/build.gradle @@ -139,7 +139,7 @@ subprojects { } else { executable new File(checkoutDir, 'gradlew').toString() } - args ":distribution:deb:assemble", ":distribution:rpm:assemble", ":distribution:zip:assemble", "-Dbuild.snapshot=${System.getProperty('build.snapshot') ?: 'true'}" + args ":distribution:deb:assemble", ":distribution:rpm:assemble", ":distribution:zip:assemble", "-Dbuild.snapshot=true" final LogLevel logLevel = gradle.startParameter.logLevel if ([LogLevel.QUIET, LogLevel.WARN, LogLevel.INFO, LogLevel.DEBUG].contains(logLevel)) { args "--${logLevel.name().toLowerCase(Locale.ENGLISH)}"