Repository: spark Updated Branches: refs/heads/master 1aa90e39e -> 7ac072f74
SPARK-5143 [BUILD] [WIP] spark-network-yarn 2.11 depends on spark-network-shuffle 2.10 Update `<scala.binary.version>` prop in POM when switching between Scala 2.10/2.11 ScrapCodes for review. This `sed` command is supposed to just replace the first occurrence, but it replaces them all. Are you more of a `sed` wizard than I? It may be a GNU/BSD thing that is throwing me off. Really, just the first instance should be replaced, hence the `[WIP]`. NB on OS X the original `sed` command here will create files like `pom.xml-e` through the source tree though it otherwise works. It's like `-e` is also the arg to `-i`. I couldn't get rid of that even with `-i""`. No biggie. Author: Sean Owen <so...@cloudera.com> Closes #4876 from srowen/SPARK-5143 and squashes the following commits: b060c44 [Sean Owen] Oops, fixed reversed version numbers! e875d4a [Sean Owen] Add note about non-GNU sed; fix new pom.xml update to work as intended on GNU sed 703e1eb [Sean Owen] Update scala.binary.version prop in POM when switching between Scala 2.10/2.11 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7ac072f7 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7ac072f7 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7ac072f7 Branch: refs/heads/master Commit: 7ac072f74b5a9a02339cede82ad5ffec5beed715 Parents: 1aa90e3 Author: Sean Owen <so...@cloudera.com> Authored: Wed Mar 4 21:00:51 2015 -0800 Committer: Patrick Wendell <patr...@databricks.com> Committed: Wed Mar 4 21:00:51 2015 -0800 ---------------------------------------------------------------------- dev/change-version-to-2.10.sh | 8 +++++++- dev/change-version-to-2.11.sh | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/7ac072f7/dev/change-version-to-2.10.sh ---------------------------------------------------------------------- diff --git a/dev/change-version-to-2.10.sh b/dev/change-version-to-2.10.sh index 7473c20..15e0c73 100755 --- a/dev/change-version-to-2.10.sh +++ b/dev/change-version-to-2.10.sh @@ -16,5 +16,11 @@ # 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) + find . -name 'pom.xml' | grep -v target \ - | xargs -I {} sed -i -e 's|\(artifactId.*\)_2.11|\1_2.10|g' {} + | xargs -I {} sed -i -e 's/\(artifactId.*\)_2.11/\1_2.10/g' {} + +# Also update <scala.binary.version> in parent POM +sed -i -e '0,/<scala\.binary\.version>2.11</s//<scala.binary.version>2.10</' pom.xml http://git-wip-us.apache.org/repos/asf/spark/blob/7ac072f7/dev/change-version-to-2.11.sh ---------------------------------------------------------------------- diff --git a/dev/change-version-to-2.11.sh b/dev/change-version-to-2.11.sh index 3957a9f..c0a8cb4 100755 --- a/dev/change-version-to-2.11.sh +++ b/dev/change-version-to-2.11.sh @@ -17,5 +17,10 @@ # limitations under the License. # +# Note that this will not necessarily work as intended with non-GNU sed (e.g. OS X) + find . -name 'pom.xml' | grep -v target \ - | xargs -I {} sed -i -e 's|\(artifactId.*\)_2.10|\1_2.11|g' {} + | 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</' pom.xml --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
