You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by st...@apache.org on 2018/02/12 09:31:39 UTC
[1/2] johnzon git commit: JOHNZON-157 test for showing broken
readObject
Repository: johnzon
Updated Branches:
refs/heads/master ecbbe0631 -> 1799768f6
JOHNZON-157 test for showing broken readObject
Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/cadcefb2
Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/cadcefb2
Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/cadcefb2
Branch: refs/heads/master
Commit: cadcefb28a4c02a35c2957b6d1afa876fcaf991d
Parents: ecbbe06
Author: Mark Struberg <st...@apache.org>
Authored: Mon Feb 12 10:23:52 2018 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Mon Feb 12 10:23:52 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/johnzon/core/JsonParserTest.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/johnzon/blob/cadcefb2/johnzon-core/src/test/java/org/apache/johnzon/core/JsonParserTest.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonParserTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonParserTest.java
index 0a6e975..9231853 100644
--- a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonParserTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonParserTest.java
@@ -26,6 +26,8 @@ import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.CharArrayReader;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
@@ -46,6 +48,7 @@ import javax.json.stream.JsonParser;
import javax.json.stream.JsonParser.Event;
import javax.json.stream.JsonParsingException;
+import org.junit.Assert;
import org.junit.Test;
public class JsonParserTest {
@@ -64,6 +67,14 @@ public class JsonParserTest {
}
}
+ @Test
+ public void testParseGetObject() throws Exception {
+ String json = "{\"a\":1,\"b\":2 }";
+ JsonParser parser = Json.createParser(new StringReader(json));
+ JsonObject jsonObject = parser.getObject();
+ Assert.assertNotNull(jsonObject);
+ }
+
private void assertSimple(final JsonParser parser) {
{
assertTrue(parser.hasNext());
[2/2] johnzon git commit: back to 1.1.6-SNAPSHOT after VOTE got
cancelled
Posted by st...@apache.org.
back to 1.1.6-SNAPSHOT after VOTE got cancelled
Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/1799768f
Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/1799768f
Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/1799768f
Branch: refs/heads/master
Commit: 1799768f6ed8345b5b1b572070f1ca73224f4e29
Parents: cadcefb
Author: Mark Struberg <st...@apache.org>
Authored: Mon Feb 12 10:31:21 2018 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Mon Feb 12 10:31:21 2018 +0100
----------------------------------------------------------------------
johnzon-core/pom.xml | 2 +-
johnzon-distribution/pom.xml | 2 +-
johnzon-jaxrs/pom.xml | 2 +-
johnzon-jsonb/pom.xml | 2 +-
johnzon-mapper/pom.xml | 2 +-
johnzon-maven-plugin/pom.xml | 2 +-
johnzon-websocket/pom.xml | 2 +-
pom.xml | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/johnzon/blob/1799768f/johnzon-core/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml
index f1bb0f2..45e8283 100644
--- a/johnzon-core/pom.xml
+++ b/johnzon-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/johnzon/blob/1799768f/johnzon-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml
index d9693f2..e826b7f 100644
--- a/johnzon-distribution/pom.xml
+++ b/johnzon-distribution/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/johnzon/blob/1799768f/johnzon-jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml
index 9ce102b..08c81b1 100644
--- a/johnzon-jaxrs/pom.xml
+++ b/johnzon-jaxrs/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/johnzon/blob/1799768f/johnzon-jsonb/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index f90e1fa..15d536e 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/johnzon/blob/1799768f/johnzon-mapper/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml
index b61543d..2104a3f 100644
--- a/johnzon-mapper/pom.xml
+++ b/johnzon-mapper/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/johnzon/blob/1799768f/johnzon-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml
index 54eab3a..deb1f88 100644
--- a/johnzon-maven-plugin/pom.xml
+++ b/johnzon-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.6-SNAPSHOT</version>
</parent>
<artifactId>johnzon-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/johnzon/blob/1799768f/johnzon-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml
index 0d2380e..af8a8e0 100644
--- a/johnzon-websocket/pom.xml
+++ b/johnzon-websocket/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/johnzon/blob/1799768f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 63a619a..516c63f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon</artifactId>
<packaging>pom</packaging>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.6-SNAPSHOT</version>
<name>Apache Johnzon</name>
<description>Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing).</description>
<inceptionYear>2014</inceptionYear>