Remove snapshot conditional for bwc snapshots (#28657)

hub-cap · hub-cap · commit 99a087995af2 · 2018-02-13T10:37:34.000-06:00
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
diff --git 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)}"

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ subprojects {`
`139`	`139`	`} else {`
`140`	`140`	`executable new File(checkoutDir, 'gradlew').toString()`
`141`	`141`	`}`
`142`		`- args ":distribution:deb:assemble", ":distribution:rpm:assemble", ":distribution:zip:assemble", "-Dbuild.snapshot=${System.getProperty('build.snapshot') ?: 'true'}"`
	`142`	`+ args ":distribution:deb:assemble", ":distribution:rpm:assemble", ":distribution:zip:assemble", "-Dbuild.snapshot=true"`
`143`	`143`	`final LogLevel logLevel = gradle.startParameter.logLevel`
`144`	`144`	`if ([LogLevel.QUIET, LogLevel.WARN, LogLevel.INFO, LogLevel.DEBUG].contains(logLevel)) {`
`145`	`145`	`args "--${logLevel.name().toLowerCase(Locale.ENGLISH)}"`