Skip to content
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

[SPARK-4225][SQL] Resorts to SparkContext.version to inspect Spark version #3105

Closed
wants to merge 1 commit into from

Conversation

liancheng
Copy link
Contributor

This PR resorts to SparkContext.version rather than META-INF/MANIFEST.MF in the assembly jar to inspect Spark version. Currently, when built with Maven, the MANIFEST.MF file in the assembly jar is incorrectly replaced by Guava 15.0 MANIFEST.MF, probably because of the assembly/shading tricks.

Another related PR is #3103, which tries to fix the MANIFEST issue.

@SparkQA
Copy link

SparkQA commented Nov 5, 2014

Test build #22917 has started for PR 3105 at commit 9ac61df.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Nov 5, 2014

Test build #22917 has finished for PR 3105 at commit 9ac61df.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/22917/
Test PASSed.

@scwf
Copy link
Contributor

scwf commented Nov 7, 2014

@liancheng, you need rebase this:)

@liancheng
Copy link
Contributor Author

@scwf Thanks for reminding, rebased.

@SparkQA
Copy link

SparkQA commented Nov 7, 2014

Test build #23053 has started for PR 3105 at commit d9585e1.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Nov 7, 2014

Test build #23053 has finished for PR 3105 at commit d9585e1.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/23053/
Test PASSed.

@scwf
Copy link
Contributor

scwf commented Nov 7, 2014

LGTM.

@marmbrus
Copy link
Contributor

marmbrus commented Nov 7, 2014

Thanks! Merged to master and 1.2.

asfgit pushed a commit that referenced this pull request Nov 7, 2014
…rsion

This PR resorts to `SparkContext.version` rather than META-INF/MANIFEST.MF in the assembly jar to inspect Spark version. Currently, when built with Maven, the MANIFEST.MF file in the assembly jar is incorrectly replaced by Guava 15.0 MANIFEST.MF, probably because of the assembly/shading tricks.

Another related PR is #3103, which tries to fix the MANIFEST issue.

Author: Cheng Lian <lian@databricks.com>

Closes #3105 from liancheng/spark-4225 and squashes the following commits:

d9585e1 [Cheng Lian] Resorts to SparkContext.version to inspect Spark version

(cherry picked from commit 86e9eaa)
Signed-off-by: Michael Armbrust <michael@databricks.com>
@asfgit asfgit closed this in 86e9eaa Nov 7, 2014
@JoshRosen
Copy link
Contributor

@liancheng liancheng deleted the spark-4225 branch November 9, 2014 07:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants