[libjsonp-java] 02/06: Merge tag 'upstream/1.0.4'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Jan 15 11:12:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libjsonp-java.
commit 373a3ce042679a6f64749587ed9c53e2a5ddf0cf
Merge: a6e4cba a7ead9b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jan 15 10:20:55 2016 +0100
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
api/pom.xml | 14 +-
api/src/main/java/javax/json/Json.java | 109 +----
api/src/main/java/javax/json/JsonArray.java | 44 +-
api/src/main/java/javax/json/JsonArrayBuilder.java | 442 +--------------------
.../main/java/javax/json/JsonBuilderFactory.java | 26 +-
api/src/main/java/javax/json/JsonException.java | 2 +
api/src/main/java/javax/json/JsonMergePatch.java | 123 ------
api/src/main/java/javax/json/JsonNumber.java | 16 +-
api/src/main/java/javax/json/JsonObject.java | 2 +
.../main/java/javax/json/JsonObjectBuilder.java | 33 +-
api/src/main/java/javax/json/JsonPatch.java | 333 ----------------
api/src/main/java/javax/json/JsonPatchBuilder.java | 353 ----------------
api/src/main/java/javax/json/JsonPointer.java | 380 ------------------
api/src/main/java/javax/json/JsonReader.java | 37 +-
.../main/java/javax/json/JsonReaderFactory.java | 4 +-
api/src/main/java/javax/json/JsonString.java | 2 +
api/src/main/java/javax/json/JsonStructure.java | 15 +-
api/src/main/java/javax/json/JsonUtil.java | 95 -----
api/src/main/java/javax/json/JsonValue.java | 45 +--
api/src/main/java/javax/json/JsonWriter.java | 24 +-
.../main/java/javax/json/JsonWriterFactory.java | 4 +-
api/src/main/java/javax/json/NodeReference.java | 276 -------------
api/src/main/java/javax/json/package-info.java | 18 +-
api/src/main/java/javax/json/spi/JsonProvider.java | 144 +------
api/src/main/java/javax/json/spi/package-info.java | 1 +
.../java/javax/json/stream/JsonCollectors.java | 169 --------
.../javax/json/stream/JsonGenerationException.java | 2 +
.../main/java/javax/json/stream/JsonGenerator.java | 54 ++-
.../javax/json/stream/JsonGeneratorFactory.java | 7 +-
.../main/java/javax/json/stream/JsonLocation.java | 10 +-
.../main/java/javax/json/stream/JsonParser.java | 201 +---------
.../java/javax/json/stream/JsonParserFactory.java | 9 +-
.../javax/json/stream/JsonParsingException.java | 2 +
.../main/java/javax/json/stream/package-info.java | 1 +
api/src/main/javadoc/overview.html | 9 +-
bundles/licensee/pom.xml | 2 +-
bundles/pom.xml | 6 +-
bundles/ri/pom.xml | 2 +-
demos/facebook/pom.xml | 10 +-
demos/jaxrs/pom.xml | 9 +-
demos/jsonpointer/pom.xml | 10 +-
demos/pom.xml | 4 +-
demos/servlet/pom.xml | 9 +-
demos/twitter/pom.xml | 10 +-
.../jsondemos/twitter/TwitterStreamSearch.java | 3 +
gf/customprovider/pom.xml | 2 +-
gf/defaultprovider/pom.xml | 2 +-
gf/pom.xml | 5 +-
impl/pom.xml | 9 +-
.../java/org/glassfish/json/BufferPoolImpl.java | 4 +-
.../org/glassfish/json/JsonArrayBuilderImpl.java | 227 +----------
.../org/glassfish/json/JsonBuilderFactoryImpl.java | 14 +-
.../java/org/glassfish/json/JsonGeneratorImpl.java | 28 +-
.../main/java/org/glassfish/json/JsonMessages.java | 25 +-
.../java/org/glassfish/json/JsonNumberImpl.java | 3 -
.../org/glassfish/json/JsonObjectBuilderImpl.java | 70 +---
.../java/org/glassfish/json/JsonParserImpl.java | 249 ++----------
.../java/org/glassfish/json/JsonProviderImpl.java | 49 +--
.../java/org/glassfish/json/JsonReaderImpl.java | 115 +++++-
.../java/org/glassfish/json/JsonStringImpl.java | 3 -
.../org/glassfish/json/JsonStructureParser.java | 2 +-
.../java/org/glassfish/json/JsonTokenizer.java | 78 +---
.../java/org/glassfish/json/JsonWriterImpl.java | 24 +-
.../json/UnicodeDetectingInputStream.java | 17 +-
.../org/glassfish/json/messages.properties | 20 +-
jaxrs-1x/pom.xml | 106 -----
.../json/jaxrs1x/JsonStructureBodyReader.java | 100 -----
.../json/jaxrs1x/JsonStructureBodyWriter.java | 115 ------
jaxrs/pom.xml | 12 +-
.../json/jaxrs/JsonStructureBodyReader.java | 9 +-
.../json/jaxrs/JsonStructureBodyWriter.java | 9 +-
pom.xml | 105 ++---
tests/pom.xml | 6 +-
.../glassfish/json/tests/JsonCollectorTest.java | 185 ---------
.../json/tests/JsonGeneratorFactoryTest.java | 2 +-
.../glassfish/json/tests/JsonGeneratorTest.java | 4 +-
.../json/tests/JsonMergePatchDiffTest.java | 136 -------
.../glassfish/json/tests/JsonMergePatchTest.java | 138 -------
.../json/tests/JsonParserFactoryTest.java | 2 +-
.../org/glassfish/json/tests/JsonParserTest.java | 23 +-
.../json/tests/JsonParsingExceptionTest.java | 19 +-
.../glassfish/json/tests/JsonPatchBuilderTest.java | 106 -----
.../glassfish/json/tests/JsonPatchDiffTest.java | 138 -------
.../org/glassfish/json/tests/JsonPatchTest.java | 142 -------
.../json/tests/JsonPointerAddOperationTest.java | 227 -----------
.../json/tests/JsonPointerRemoveOperationTest.java | 181 ---------
.../tests/JsonPointerReplaceOperationTest.java | 225 -----------
.../org/glassfish/json/tests/JsonPointerTest.java | 132 ------
.../org/glassfish/json/tests/JsonReaderTest.java | 66 +--
.../json/tests/JsonSamplesParsingTest.java | 5 +-
.../java/org/glassfish/json/tests/RFC7159Test.java | 126 ------
.../java/org/glassfish/json/tests/ToJsonTest.java | 82 ----
tests/src/test/resources/jsonmergepatch.json | 103 -----
tests/src/test/resources/jsonmergepatchdiff.json | 60 ---
tests/src/test/resources/jsonpatch.json | 214 ----------
tests/src/test/resources/jsonpatchdiff.json | 132 ------
tests/src/test/resources/rfc6901.json | 20 -
97 files changed, 505 insertions(+), 6442 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjsonp-java.git
More information about the pkg-java-commits
mailing list