Skip to content

Conversation

@srowen
Copy link
Member

@srowen srowen commented Nov 7, 2016

What changes were proposed in this pull request?

Try excluding org.json:json from hive-exec dep as it's Cat X now. It may be the case that it's not used by the part of Hive Spark uses anyway.

How was this patch tested?

Existing tests

@SparkQA
Copy link

SparkQA commented Nov 7, 2016

Test build #68280 has finished for PR 15798 at commit c25d6ad.

  • This patch fails build dependency tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@busbey
Copy link

busbey commented Nov 7, 2016

apologies if this is just a test run. If review comments are welcome currently, you should also update the top level NOTICE file to remove the blurb for org.json:

This product includes/uses org.json (http://www.json.org/java/index.html),
Copyright (c) 2002 JSON.org

@srowen
Copy link
Member Author

srowen commented Nov 7, 2016

Yeah just a test run right now ([WIP]) to see if it works at all; see a little more background on the JIRA. Indeed I'd clean out all of those refs before committing something like this.

@SparkQA
Copy link

SparkQA commented Nov 7, 2016

Test build #68291 has finished for PR 15798 at commit 85bdbff.

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

@srowen
Copy link
Member Author

srowen commented Nov 7, 2016

Hm, so indeed Jenkins tests find this is fine to exclude. I ran into local test failures that looked unrelated, even if they were persistent, so could be noise.

My next step will be to make all the other license changes to make this a possibly mergeable change, just in case we do want to merge.

@rxin
Copy link
Contributor

rxin commented Nov 8, 2016

SGTM. Thanks for doing this.

@srowen
Copy link
Member Author

srowen commented Nov 8, 2016

I removed the entry in NOTICE. Interestingly we're supposed to preserve the NOTICE file contents of projects that are redistributed and this comes from Hive. However I suspect it is not required to retain portions of NOTICE that will not apply to Spark's distribution.

@busbey
Copy link

busbey commented Nov 8, 2016

That interpretation lines up with my understanding; we only need to recreate the portions of NOTICE that are applicable.

@SparkQA
Copy link

SparkQA commented Nov 8, 2016

Test build #68339 has finished for PR 15798 at commit 34c55b8.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Nov 8, 2016

Test build #3419 has finished for PR 15798 at commit 34c55b8.

  • This patch fails PySpark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Nov 8, 2016

Test build #3420 has finished for PR 15798 at commit 34c55b8.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Nov 10, 2016

Test build #3421 has finished for PR 15798 at commit 34c55b8.

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

@rxin
Copy link
Contributor

rxin commented Nov 10, 2016

Is this still WIP?

@srowen srowen changed the title [SPARK-18262][BUILD][SQL][WIP] JSON.org license is now CatX [SPARK-18262][BUILD][SQL] JSON.org license is now CatX Nov 10, 2016
@srowen
Copy link
Member Author

srowen commented Nov 10, 2016

I think it's mergeable. I'm slightly suspicious it was just this easy, but tests have passed.

@rxin
Copy link
Contributor

rxin commented Nov 10, 2016

OK let's see. Merging in master/branch-2.1.

asfgit pushed a commit that referenced this pull request Nov 10, 2016
## What changes were proposed in this pull request?

Try excluding org.json:json from hive-exec dep as it's Cat X now. It may be the case that it's not used by the part of Hive Spark uses anyway.

## How was this patch tested?

Existing tests

Author: Sean Owen <[email protected]>

Closes #15798 from srowen/SPARK-18262.

(cherry picked from commit 16eaad9)
Signed-off-by: Reynold Xin <[email protected]>
@asfgit asfgit closed this in 16eaad9 Nov 10, 2016
@srowen srowen deleted the SPARK-18262 branch November 14, 2016 11:11
uzadude pushed a commit to uzadude/spark that referenced this pull request Jan 27, 2017
## What changes were proposed in this pull request?

Try excluding org.json:json from hive-exec dep as it's Cat X now. It may be the case that it's not used by the part of Hive Spark uses anyway.

## How was this patch tested?

Existing tests

Author: Sean Owen <[email protected]>

Closes apache#15798 from srowen/SPARK-18262.
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.

4 participants