From 1f4863522b1ccf8c114ad680a76c58d6687802ca Mon Sep 17 00:00:00 2001 From: trobro Date: Sat, 14 Oct 2023 18:04:24 +0200 Subject: [PATCH 1/3] version, history --- gradle.properties | 2 +- history.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 431ff45..e6b9e0d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ group=org.hjson name=hjson -version=3.0.1 +version=3.1.0 description=Hjson, the Human JSON diff --git a/history.md b/history.md index 615f708..d1a8a3f 100644 --- a/history.md +++ b/history.md @@ -1,5 +1,11 @@ # hjson-java History +- v3.1.0 + - escapes all control chars + - changes in formatted JSON output: + - opening braces now appear on the same line as the key when an array or an object are values in an object + - the root object or array are no longer preceded by a blank newline + - empty arrays or objects now appear on a line of their own when they are elements in an array - v3.0.1 - fix for CVE-2023-34620 by not trying to parse more than 1000 levels into arrays and/or objects - fix for empty multiline string inside array or object From 35f129969133b894870d73a2d5c9472dd5897f0b Mon Sep 17 00:00:00 2001 From: trobro Date: Sat, 14 Oct 2023 18:07:07 +0200 Subject: [PATCH 2/3] docs --- docs/allclasses-frame.html | 2 +- docs/allclasses-noframe.html | 2 +- docs/constant-values.html | 4 ++-- docs/deprecated-list.html | 4 ++-- docs/help-doc.html | 4 ++-- docs/index-all.html | 4 ++-- docs/index.html | 2 +- docs/org/hjson/HjsonDsf.html | 4 ++-- docs/org/hjson/HjsonOptions.html | 4 ++-- docs/org/hjson/IHjsonDsfProvider.html | 4 ++-- docs/org/hjson/JsonArray.html | 4 ++-- docs/org/hjson/JsonObject.Member.html | 4 ++-- docs/org/hjson/JsonObject.html | 4 ++-- docs/org/hjson/JsonType.html | 4 ++-- docs/org/hjson/JsonValue.html | 4 ++-- docs/org/hjson/ParseException.html | 4 ++-- docs/org/hjson/Stringify.html | 4 ++-- docs/org/hjson/package-frame.html | 2 +- docs/org/hjson/package-summary.html | 4 ++-- docs/org/hjson/package-tree.html | 4 ++-- docs/overview-tree.html | 4 ++-- docs/serialized-form.html | 4 ++-- 22 files changed, 40 insertions(+), 40 deletions(-) diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html index 70a7f4d..b78d2d4 100644 --- a/docs/allclasses-frame.html +++ b/docs/allclasses-frame.html @@ -3,7 +3,7 @@ -All Classes (hjson 3.0.1 API) +All Classes (hjson 3.1.0 API) diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html index 6a34fcf..ebe7b9b 100644 --- a/docs/allclasses-noframe.html +++ b/docs/allclasses-noframe.html @@ -3,7 +3,7 @@ -All Classes (hjson 3.0.1 API) +All Classes (hjson 3.1.0 API) diff --git a/docs/constant-values.html b/docs/constant-values.html index cd87fbb..fce4220 100644 --- a/docs/constant-values.html +++ b/docs/constant-values.html @@ -3,7 +3,7 @@ -Constant Field Values (hjson 3.0.1 API) +Constant Field Values (hjson 3.1.0 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ diff --git a/docs/org/hjson/package-summary.html b/docs/org/hjson/package-summary.html index fc4b8e8..43f29a5 100644 --- a/docs/org/hjson/package-summary.html +++ b/docs/org/hjson/package-summary.html @@ -3,7 +3,7 @@ -org.hjson (hjson 3.0.1 API) +org.hjson (hjson 3.1.0 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@