Skip to content

Commit

Permalink
SPARK-5143 [BUILD] [WIP] spark-network-yarn 2.11 depends on spark-net…
Browse files Browse the repository at this point in the history
…work-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 <[email protected]>

Closes apache#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
  • Loading branch information
srowen authored and pwendell committed Mar 5, 2015
1 parent 1aa90e3 commit 7ac072f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
8 changes: 7 additions & 1 deletion dev/change-version-to-2.10.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 6 additions & 1 deletion dev/change-version-to-2.11.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 7ac072f

Please sign in to comment.