[json-smart] 02/02: Merge tag 'upstream/1.2'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository json-smart.

commit 129f19c80126f19dbdf60b15b5984820d4b7386e
Merge: 1c21181 920f620
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 31 14:47:06 2016 +0200

    Merge tag 'upstream/1.2'
    
    Upstream version 1.2

 .gitignore                                         |  15 +
 json-smart-mini/ChangeLog.txt                      |   8 +
 json-smart-mini/LICENSE.txt                        | 202 ++++++
 json-smart-mini/pom.xml                            |  35 +
 json-smart-mini/readme.txt                         |   2 +
 .../src/main/java/net/minidev/json/JSONArray.java  |  84 +++
 .../src/main/java/net/minidev/json/JSONAware.java  |  12 +
 .../src/main/java/net/minidev/json/JSONObject.java | 188 +++++
 .../java/net/minidev/json/JSONStreamAware.java     |  14 +
 .../src/main/java/net/minidev/json/JSONValue.java  | 164 +++++
 .../src/main/java/net/minidev/json/JStylerObj.java | 108 +++
 .../net/minidev/json/parser/ContainerFactory.java  |  31 +
 .../net/minidev/json/parser/ContentHandler.java    | 110 +++
 .../java/net/minidev/json/parser/JSONParser.java   |  80 +++
 .../net/minidev/json/parser/JSONParserStream.java  | 466 +++++++++++++
 .../net/minidev/json/parser/ParseException.java    |  88 +++
 .../test/java/net/minidev/json/test/TestFloat.java |  34 +
 .../test/java/net/minidev/json/test/TestInts.java  |  42 ++
 .../java/net/minidev/json/test/TestKeyword.java    |  31 +
 .../java/net/minidev/json/test/TestString.java     |  30 +
 json-smart-sample/pom.xml                          |  28 +
 json-smart/ChangeLog.txt                           |   8 +
 json-smart/LICENSE.txt                             | 202 ++++++
 json-smart/pom.xml                                 |  45 ++
 json-smart/readme.txt                              |   2 +
 .../src/main/java/net/minidev/json/JSONArray.java  | 133 ++++
 .../src/main/java/net/minidev/json/JSONAware.java  |  29 +
 .../main/java/net/minidev/json/JSONAwareEx.java    |  32 +
 .../src/main/java/net/minidev/json/JSONNavi.java   | 683 +++++++++++++++++++
 .../src/main/java/net/minidev/json/JSONObject.java | 253 +++++++
 .../java/net/minidev/json/JSONStreamAware.java     |  31 +
 .../java/net/minidev/json/JSONStreamAwareEx.java   |  31 +
 .../src/main/java/net/minidev/json/JSONStyle.java  | 193 ++++++
 .../main/java/net/minidev/json/JSONStyleIdent.java | 127 ++++
 .../src/main/java/net/minidev/json/JSONUtil.java   |  69 ++
 .../src/main/java/net/minidev/json/JSONValue.java  | 758 +++++++++++++++++++++
 .../src/main/java/net/minidev/json/JStylerObj.java | 322 +++++++++
 .../net/minidev/json/parser/ContainerFactory.java  |  70 ++
 .../net/minidev/json/parser/ContentHandler.java    | 123 ++++
 .../json/parser/ContentHandlerCompressor.java      | 137 ++++
 .../minidev/json/parser/ContentHandlerDumy.java    |  65 ++
 .../minidev/json/parser/FakeContainerFactory.java  |  81 +++
 .../java/net/minidev/json/parser/JSONParser.java   | 260 +++++++
 .../net/minidev/json/parser/JSONParserBase.java    | 663 ++++++++++++++++++
 .../minidev/json/parser/JSONParserByteArray.java   | 110 +++
 .../minidev/json/parser/JSONParserInputStream.java |  89 +++
 .../net/minidev/json/parser/JSONParserMemory.java  | 143 ++++
 .../net/minidev/json/parser/JSONParserReader.java  |  88 +++
 .../net/minidev/json/parser/JSONParserStream.java  | 142 ++++
 .../net/minidev/json/parser/JSONParserString.java  |  95 +++
 .../net/minidev/json/parser/ParseException.java    | 125 ++++
 .../test/java/net/minidev/json/test/BugReport.java |  23 +
 .../java/net/minidev/json/test/JSONSimpleTest.java |  21 +
 .../java/net/minidev/json/test/MustThrows.java     |  34 +
 .../java/net/minidev/json/test/TestCompressor.java |  57 ++
 .../net/minidev/json/test/TestCompressorFlags.java |  94 +++
 .../test/java/net/minidev/json/test/TestFloat.java |  37 +
 .../net/minidev/json/test/TestFloatStrict.java     |  25 +
 .../test/java/net/minidev/json/test/TestInts.java  |  88 +++
 .../java/net/minidev/json/test/TestKeyword.java    |  37 +
 .../test/java/net/minidev/json/test/TestMisc.java  |  68 ++
 .../test/java/net/minidev/json/test/TestNavi.java  |  58 ++
 .../net/minidev/json/test/TestNumberPrecision.java |  41 ++
 .../java/net/minidev/json/test/TestStrict.java     |  43 ++
 .../java/net/minidev/json/test/TestString.java     |  53 ++
 .../net/minidev/json/test/TestStringStrict.java    |  18 +
 .../java/net/minidev/json/test/TestTruncated.java  |  22 +
 .../json/test/strict/TestExcessiveComma.java       |  44 ++
 .../minidev/json/test/strict/TestTaillingJunk.java |  36 +
 .../net/minidev/json/test/strict/TestZeroLead.java |  69 ++
 .../net/minidev/json/testMapping/TestMapBeans.java | 117 ++++
 .../minidev/json/testMapping/TestMapPublic.java    | 242 +++++++
 .../json/testMapping/TestSerPrimArrays.java        |  21 +
 parent/pom.xml                                     | 278 ++++++++
 74 files changed, 8407 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/json-smart.git