Skip to content

Commit

Permalink
Fixing issue where we overrode non-spark version numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
pwendell committed Nov 17, 2014
1 parent 9df3a50 commit e2a24bb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
package object function
9 changes: 7 additions & 2 deletions dev/create-release/create-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e2a24bb

Please sign in to comment.