Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions scripts/jenkins-test
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ then
exit 1
fi

if [ ${SPARK_VERSION} == 3.0.0 ];
then
./scripts/move_to_spark_3.sh
fi

# is the scala version set?
if ! [[ ${SCALA_VERSION} ]];
then
Expand Down
2 changes: 1 addition & 1 deletion scripts/move_to_spark_2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ substitution_cmd="s/-spark3_$svp/-spark2_$svp/g"
find . -name "pom.xml" -exec sed \
-e "/utils-/ s/-spark3_2\.1/-spark2_2\.1/" \
-e "/utils-/ $substitution_cmd" \
-e "/spark.version/ s/3.0.0-preview2/2.4.6/g" \
-e "/spark.version/ s/3.0.0/2.4.6/g" \
-i.spark2.bak '{}' \;
2 changes: 1 addition & 1 deletion scripts/move_to_spark_3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ substitution_cmd="s/-spark2_$svp/-spark3_$svp/g"
find . -name "pom.xml" -exec sed \
-e "/utils-/ s/-spark2_2\.1/-spark3_2\.1/" \
-e "/utils-/ $substitution_cmd" \
-e "/spark.version/ s/2.4.6/3.0.0-preview2/g" \
-e "/spark.version/ s/2.4.6/3.0.0/g" \
-i.spark3.bak '{}' \;
20 changes: 20 additions & 0 deletions scripts/release/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,26 @@ if [ $? != 0 ]; then
exit 1
fi

# do spark 3, scala 2.12 release
git checkout -b maint_spark3_2.12-${release} ${branch}
./scripts/move_to_scala_2.12.sh
./scripts/move_to_spark_3.sh
git commit -a -m "Modifying pom.xml files for Spark 3, Scala 2.12 release."
mvn --batch-mode \
-Dresume=false \
-Dtag=utils-parent-spark3_2.12-${release} \
-DreleaseVersion=${release} \
-DdevelopmentVersion=${devel} \
-DbranchName=utils-spark3_2.12-${release} \
release:clean \
release:prepare \
release:perform

if [ $? != 0 ]; then
echo "Releasing Spark 3, Scala 2.12 version failed."
exit 1
fi

if [ $branch = "master" ]; then
# if original branch was master, update versions on original branch
git checkout ${branch}
Expand Down