@@ -133,26 +133,51 @@ CURRENT_BLOCK=$BLOCK_PYTHON_STYLE
133133
134134echo " "
135135echo " ========================================================================="
136- echo " Building Spark"
136+ echo " Building Spark with hive 0.12 "
137137echo " ========================================================================="
138138
139139CURRENT_BLOCK=$BLOCK_BUILD
140140
141141{
142142 # We always build with Hive because the PySpark Spark SQL tests need it.
143- BUILD_MVN_PROFILE_ARGS =" $SBT_MAVEN_PROFILES_ARGS -Phive -Phive-0.12.0"
143+ BUILD_MVN_PROFILE_ARGS_12 =" $SBT_MAVEN_PROFILES_ARGS -Phive -Phive-0.12.0"
144144
145- echo " [info] Building Spark with these arguments: $BUILD_MVN_PROFILE_ARGS "
145+ echo " [info] Building Spark with these arguments: $BUILD_MVN_PROFILE_ARGS_12 "
146146
147147 # NOTE: echo "q" is needed because sbt on encountering a build file with failure
148148 # + (either resolution or compilation) prompts the user for input either q, r, etc
149149 # + to quit or retry. This echo is there to make it not block.
150- # NOTE: Do not quote $BUILD_MVN_PROFILE_ARGS or else it will be interpreted as a
150+ # NOTE: Do not quote $BUILD_MVN_PROFILE_ARGS_12 or else it will be interpreted as a
151151 # + single argument!
152152 # QUESTION: Why doesn't 'yes "q"' work?
153153 # QUESTION: Why doesn't 'grep -v -e "^\[info\] Resolving"' work?
154154 echo -e " q\n" \
155- | sbt/sbt $BUILD_MVN_PROFILE_ARGS clean package assembly/assembly \
155+ | sbt/sbt $BUILD_MVN_PROFILE_ARGS_12 clean package assembly/assembly \
156+ | grep -v -e " info.*Resolving" -e " warn.*Merging" -e " info.*Including"
157+ }
158+
159+ echo " "
160+ echo " ========================================================================="
161+ echo " Building Spark with hive 0.13"
162+ echo " ========================================================================="
163+
164+ CURRENT_BLOCK=$BLOCK_BUILD
165+
166+ {
167+ # We always build with Hive because the PySpark Spark SQL tests need it.
168+ BUILD_MVN_PROFILE_ARGS_13=" $SBT_MAVEN_PROFILES_ARGS -Phive -Phive-0.13.1"
169+
170+ echo " [info] Building Spark with these arguments: $BUILD_MVN_PROFILE_ARGS_13 "
171+
172+ # NOTE: echo "q" is needed because sbt on encountering a build file with failure
173+ # + (either resolution or compilation) prompts the user for input either q, r, etc
174+ # + to quit or retry. This echo is there to make it not block.
175+ # NOTE: Do not quote $BUILD_MVN_PROFILE_ARGS_13 or else it will be interpreted as a
176+ # + single argument!
177+ # QUESTION: Why doesn't 'yes "q"' work?
178+ # QUESTION: Why doesn't 'grep -v -e "^\[info\] Resolving"' work?
179+ echo -e " q\n" \
180+ | sbt/sbt $BUILD_MVN_PROFILE_ARGS_13 clean package assembly/assembly \
156181 | grep -v -e " info.*Resolving" -e " warn.*Merging" -e " info.*Including"
157182}
158183
0 commit comments