[SPARK-2437] Rename MAVEN_PROFILES to SBT_MAVEN_PROFILES and add SBT_MAVEN_PROPERTIES
NOTE: It is not possible to use both env variable `SBT_MAVEN_PROFILES` and `-P` flag at same time. `-P` if specified takes precedence. Author: Prashant Sharma <prashant.s@imaginea.com> Closes #1374 from ScrapCodes/SPARK-2437/rename-MAVEN_PROFILES and squashes the following commits: 8694bde [Prashant Sharma] [SPARK-2437] Rename MAVEN_PROFILES to SBT_MAVEN_PROFILES and add SBT_MAVEN_PROPERTIES
This commit is contained in:
parent
f4f46dec5a
commit
b23e9c3e40
|
@ -86,9 +86,8 @@ object SparkBuild extends PomBuild {
|
||||||
profiles
|
profiles
|
||||||
}
|
}
|
||||||
|
|
||||||
override val profiles = Properties.envOrNone("MAVEN_PROFILES") match {
|
override val profiles = Properties.envOrNone("SBT_MAVEN_PROFILES") match {
|
||||||
case None => backwardCompatibility
|
case None => backwardCompatibility
|
||||||
// Rationale: If -P option exists no need to support backwardCompatibility.
|
|
||||||
case Some(v) =>
|
case Some(v) =>
|
||||||
if (backwardCompatibility.nonEmpty)
|
if (backwardCompatibility.nonEmpty)
|
||||||
println("Note: We ignore environment variables, when use of profile is detected in " +
|
println("Note: We ignore environment variables, when use of profile is detected in " +
|
||||||
|
@ -96,6 +95,12 @@ object SparkBuild extends PomBuild {
|
||||||
v.split("(\\s+|,)").filterNot(_.isEmpty).map(_.trim.replaceAll("-P", "")).toSeq
|
v.split("(\\s+|,)").filterNot(_.isEmpty).map(_.trim.replaceAll("-P", "")).toSeq
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Properties.envOrNone("SBT_MAVEN_PROPERTIES") match {
|
||||||
|
case Some(v) =>
|
||||||
|
v.split("(\\s+|,)").filterNot(_.isEmpty).map(_.split("=")).foreach(x => System.setProperty(x(0), x(1)))
|
||||||
|
case _ =>
|
||||||
|
}
|
||||||
|
|
||||||
override val userPropertiesMap = System.getProperties.toMap
|
override val userPropertiesMap = System.getProperties.toMap
|
||||||
|
|
||||||
lazy val sharedSettings = graphSettings ++ ScalaStyleSettings ++ Seq (
|
lazy val sharedSettings = graphSettings ++ ScalaStyleSettings ++ Seq (
|
||||||
|
|
|
@ -92,7 +92,7 @@ addJava () {
|
||||||
enableProfile () {
|
enableProfile () {
|
||||||
dlog "[enableProfile] arg = '$1'"
|
dlog "[enableProfile] arg = '$1'"
|
||||||
maven_profiles=( "${maven_profiles[@]}" "$1" )
|
maven_profiles=( "${maven_profiles[@]}" "$1" )
|
||||||
export MAVEN_PROFILES="${maven_profiles[@]}"
|
export SBT_MAVEN_PROFILES="${maven_profiles[@]}"
|
||||||
}
|
}
|
||||||
|
|
||||||
addSbt () {
|
addSbt () {
|
||||||
|
|
Loading…
Reference in a new issue