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/change-version-to-2.11.sh | |
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/change-version-to-2.11.sh')
-rwxr-xr-x | dev/change-version-to-2.11.sh | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/dev/change-version-to-2.11.sh b/dev/change-version-to-2.11.sh deleted file mode 100755 index d370019dec..0000000000 --- a/dev/change-version-to-2.11.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Note that this will not necessarily work as intended with non-GNU sed (e.g. OS X) -BASEDIR=$(dirname $0)/.. -find $BASEDIR -name 'pom.xml' | grep -v target \ - | xargs -I {} sed -i -e 's/\(artifactId.*\)_2.10/\1_2.11/g' {} - -# Also update <scala.binary.version> in parent POM -sed -i -e '0,/<scala\.binary\.version>2.10</s//<scala.binary.version>2.11</' $BASEDIR/pom.xml |