diff options
| author | Michael Allman <michael@videoamp.com> | 2015-07-21 11:14:31 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-07-21 11:14:31 +0100 |
| commit | f5b6dc5e3e7e3b586096b71164f052318b840e8a (patch) | |
| tree | 5805df5fdbe357ac99372d0fa36e1db0fd364fa3 /dev/create-release | |
| parent | 6364735bcc67ecb0e9c7e5076d214ed88e927430 (diff) | |
| download | spark-f5b6dc5e3e7e3b586096b71164f052318b840e8a.tar.gz spark-f5b6dc5e3e7e3b586096b71164f052318b840e8a.tar.bz2 spark-f5b6dc5e3e7e3b586096b71164f052318b840e8a.zip | |
[SPARK-8401] [BUILD] Scala version switching build enhancements
These commits address a few minor issues in the Scala cross-version support in the build:
1. Correct two missing `${scala.binary.version}` pom file substitutions.
2. Don't update `scala.binary.version` in parent POM. This property is set through profiles.
3. Update the source of the generated scaladocs in `docs/_plugins/copy_api_dirs.rb`.
4. Factor common code out of `dev/change-version-to-*.sh` and add some validation. We also test `sed` to see if it's GNU sed and try `gsed` as an alternative if not. This prevents the script from running with a non-GNU sed.
This is my original work and I license this work to the Spark project under the Apache License.
Author: Michael Allman <michael@videoamp.com>
Closes #6832 from mallman/scala-versions and squashes the following commits:
cde2f17 [Michael Allman] Delete dev/change-version-to-*.sh, replacing them with single dev/change-scala-version.sh script that takes a version as argument
02296f2 [Michael Allman] Make the scala version change scripts cross-platform by restricting ourselves to POSIX sed syntax instead of looking for GNU sed
ad9b40a [Michael Allman] Factor change-scala-version.sh out of change-version-to-*.sh, adding command line argument validation and testing for GNU sed
bdd20bf [Michael Allman] Update source of scaladocs when changing Scala version
475088e [Michael Allman] Replace jackson-module-scala_2.10 with jackson-module-scala_${scala.binary.version}
Diffstat (limited to 'dev/create-release')
| -rwxr-xr-x | dev/create-release/create-release.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh index 30190dcd41..86a7a4068c 100755 --- a/dev/create-release/create-release.sh +++ b/dev/create-release/create-release.sh @@ -122,13 +122,13 @@ if [[ ! "$@" =~ --skip-publish ]]; then -Phive-thriftserver -Phadoop-2.2 -Pspark-ganglia-lgpl -Pkinesis-asl \ clean install - ./dev/change-version-to-2.11.sh + ./dev/change-scala-version.sh 2.11 build/mvn -DskipTests -Pyarn -Phive -Prelease\ -Dscala-2.11 -Phadoop-2.2 -Pspark-ganglia-lgpl -Pkinesis-asl \ clean install - ./dev/change-version-to-2.10.sh + ./dev/change-scala-version.sh 2.10 pushd $SPARK_REPO @@ -205,7 +205,7 @@ if [[ ! "$@" =~ --skip-package ]]; then # TODO There should probably be a flag to make-distribution to allow 2.11 support if [[ $FLAGS == *scala-2.11* ]]; then - ./dev/change-version-to-2.11.sh + ./dev/change-scala-version.sh 2.11 fi export ZINC_PORT=$ZINC_PORT |