-
Notifications
You must be signed in to change notification settings - Fork 28.9k
[SPARK-8316] Upgrade to Maven 3.3.3 #6770
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -69,11 +69,14 @@ install_app() { | |
|
|
||
| # Install maven under the build/ folder | ||
| install_mvn() { | ||
| local MVN_VERSION="3.3.3" | ||
|
|
||
| install_app \ | ||
| "http://archive.apache.org/dist/maven/maven-3/3.2.5/binaries" \ | ||
| "apache-maven-3.2.5-bin.tar.gz" \ | ||
| "apache-maven-3.2.5/bin/mvn" | ||
| MVN_BIN="${_DIR}/apache-maven-3.2.5/bin/mvn" | ||
| "http://archive.apache.org/dist/maven/maven-3/${MVN_VERSION}/binaries" \ | ||
| "apache-maven-${MVN_VERSION}-bin.tar.gz" \ | ||
| "apache-maven-${MVN_VERSION}/bin/mvn" | ||
|
|
||
| MVN_BIN="${_DIR}/apache-maven-${MVN_VERSION}/bin/mvn" | ||
| } | ||
|
|
||
| # Install zinc under the build/ folder | ||
|
|
@@ -105,28 +108,16 @@ install_scala() { | |
| SCALA_LIBRARY="$(cd "$(dirname ${scala_bin})/../lib" && pwd)/scala-library.jar" | ||
| } | ||
|
|
||
| # Determines if a given application is already installed. If not, will attempt | ||
| # to install | ||
| ## Arg1 - application name | ||
| ## Arg2 - Alternate path to local install under build/ dir | ||
| check_and_install_app() { | ||
| # create the local environment variable in uppercase | ||
| local app_bin="`echo $1 | awk '{print toupper(\$0)}'`_BIN" | ||
| # some black magic to set the generated app variable (i.e. MVN_BIN) into the | ||
| # environment | ||
| eval "${app_bin}=`which $1 2>/dev/null`" | ||
|
|
||
| if [ -z "`which $1 2>/dev/null`" ]; then | ||
| install_$1 | ||
| fi | ||
| } | ||
|
|
||
| # Setup healthy defaults for the Zinc port if none were provided from | ||
| # the environment | ||
| ZINC_PORT=${ZINC_PORT:-"3030"} | ||
|
|
||
| # Check and install all applications necessary to build Spark | ||
| check_and_install_app "mvn" | ||
| # Install Maven if necessary | ||
| MVN_BIN="$(command -v mvn)" | ||
|
|
||
| if [ ! "$MVN_BIN" ]; then | ||
| install_mvn | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
@srowen - We can always install Maven at this step and ignore any existing Maven installs. Would that be sufficient? |
||
| fi | ||
|
|
||
| # Install the proper version of Scala and Zinc for the build | ||
| install_zinc | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed this method because I found it unnecessary and hard to understand.
CC @brennonyork who I believe wrote this, in case I missed something.