From e2a24bbf1cee2657bffd2f0459bd36de44a9cdc6 Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Mon, 17 Nov 2014 12:16:36 -0800
Subject: [PATCH] Fixing issue where we overrode non-spark version numbers

---
 .../org/apache/spark/api/java/function/package.scala     | 2 +-
 dev/create-release/create-release.sh                     | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/apache/spark/api/java/function/package.scala b/core/src/main/java/org/apache/spark/api/java/function/package.scala
index 7f91de653a64a..0f9bac7164162 100644
--- a/core/src/main/java/org/apache/spark/api/java/function/package.scala
+++ b/core/src/main/java/org/apache/spark/api/java/function/package.scala
@@ -22,4 +22,4 @@ package org.apache.spark.api.java
  * these interfaces to pass functions to various Java API methods for Spark. Please visit Spark's
  * Java programming guide for more details.
  */
-package object function 
\ No newline at end of file
+package object function 
diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh
index 38b4cf475d999..f6f14ed9e978e 100755
--- a/dev/create-release/create-release.sh
+++ b/dev/create-release/create-release.sh
@@ -62,13 +62,18 @@ if [[ ! "$@" =~ --package-only ]]; then
   # NOTE: This is done "eagerly" i.e. we don't check if we can succesfully build
   # or before we coin the release commit. This helps avoid races where
   # other people add commits to this branch while we are in the middle of building.
+  old="  <version>${RELEASE_VERSION}-SNAPSHOT<\/version>"
+  new="  <version>${RELEASE_VERSION}<\/version>"
   find . -name pom.xml -o -name package.scala | grep -v dev | xargs -I {} sed -i \
-    -e "s/${RELEASE_VERSION}-SNAPSHOT/$RELEASE_VERSION/" {}
+    -e "s/$old/$new/" {}
   git commit -a -m "Preparing Spark release $GIT_TAG"
   echo "Creating tag $GIT_TAG at the head of $GIT_BRANCH"
   git tag $GIT_TAG
+
+  old="  <version>${RELEASE_VERSION}<\/version>"
+  new="  <version>${NEXT_VERSION}-SNAPSHOT<\/version>"
   find . -name pom.xml -o -name package.scala | grep -v dev | xargs -I {} sed -i \
-    -e "s/$RELEASE_VERSION/${NEXT_VERSION}-SNAPSHOT/" {}
+    -e "s/$old/$new/" {}
   git commit -a -m "Preparing development version ${NEXT_VERSION}-SNAPSHOT"
   git push origin $GIT_TAG
   git push origin HEAD:$GIT_BRANCH