758300 - Remove MPL headers from non-MPL code

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: Android Sync, defect, P3)

Description

[Richard Newman [:rnewman]]

The auto-switch touched these:

M mobile/android/base/json-simple/ItemList.java
M mobile/android/base/json-simple/JSONArray.java
M mobile/android/base/json-simple/JSONAware.java
M mobile/android/base/json-simple/JSONObject.java
M mobile/android/base/json-simple/JSONStreamAware.java
M mobile/android/base/json-simple/JSONValue.java
M mobile/android/base/json-simple/parser/ContainerFactory.java
M mobile/android/base/json-simple/parser/ContentHandler.java
M mobile/android/base/json-simple/parser/JSONParser.java
M mobile/android/base/json-simple/parser/ParseException.java
M mobile/android/base/json-simple/parser/Yylex.java
M mobile/android/base/json-simple/parser/Yytoken.java

Comment 1

[Richard Newman [:rnewman]]

Also going to use this bug to fix manifest includes and other such files -- don't want licenses popping up in the middle of preprocessed files.

Comment 2

[Richard Newman [:rnewman]]

Attachment: Patch.

This reverts json-simple (third-party code) and our manifest includes (which are inlined into the middle of Fennec's AndroidManifest.xml, which should already be licensed).

Comment 3

[Richard Newman [:rnewman]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/579d26ef5bd0

Comment 4

[Gervase Markham [:gerv]]

Obviously, no objections here :-)

Gerv

Comment 5

[Gervase Markham [:gerv]]

Can the json-simple directory please acquire a LICENSE file, if it's 3rd party code? Currently, there's nothing to say what the licence is.

Thanks :-)

Gerv

Comment 6

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/579d26ef5bd0

Leaving open for comment 5.

Comment 7

[Richard Newman [:rnewman]]

(In reply to Gervase Markham [:gerv] from comment #5)
> Can the json-simple directory please acquire a LICENSE file, if it's 3rd
> party code? Currently, there's nothing to say what the licence is.

Absolutely! Thanks for the reminder.

Comment 8

[Richard Newman [:rnewman]]

License file added:

https://hg.mozilla.org/integration/mozilla-inbound/rev/ccee89d6d9e0

Comment 9

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/ccee89d6d9e0