From 084b24cbe7030cc5057effa9e6d269749ddf0beb Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 18 Jun 2023 12:16:14 -0500
Subject: [PATCH 1/5] Update README.md for 20230618

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0ecc12b73..e999230ba 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ JSON in Java [package org.json]
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.json/json.svg)](https://mvnrepository.com/artifact/org.json/json)
 
-**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20230227/json-20230227.jar)**
+**[Click here if you just want the latest release jar file.](https://search.maven.org/remotecontent?filepath=org/json/json/20230618/json-20230618.jar)**
 
 
 # Overview

From f6e5bfa2db9c91f7a183c1e96d41e1328ee1b638 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 18 Jun 2023 12:17:56 -0500
Subject: [PATCH 2/5] Update RELEASES.md for 20230618

---
 docs/RELEASES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 166c43a4a..ae439831c 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -5,6 +5,8 @@ and artifactId "json". For example:
 [https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav](https://search.maven.org/search?q=g:org.json%20AND%20a:json&core=gav)
 
 ~~~
+20230618    Final release with Java 1.6 compatibility. Future releases will require Java 1.8 or greater.
+
 20230227    Fix for CVE-2022-45688 and recent commits
 
 20220924    New License - public domain, and some minor updates

From c048b36516a1e35a52498f3350c6d11c10fb6f20 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 18 Jun 2023 12:18:36 -0500
Subject: [PATCH 3/5] Update pom.xml for 20230618

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f17e0abfe..ba3edbd5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20230227</version>
+    <version>20230618</version>
     <packaging>bundle</packaging>
 
     <name>JSON in Java</name>

From a963115ac2527dee688f54f7c1150d6f25b887c1 Mon Sep 17 00:00:00 2001
From: Sean Leary <stleary@gmail.com>
Date: Sun, 18 Jun 2023 12:58:32 -0500
Subject: [PATCH 4/5] Update pom.xml for maven deploy

Deploy failed on the mac pro with: gpg: signing failed: Inappropriate ioctl for device

Somehow I had a different gpg version installed. This change fixed it.
---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index ba3edbd5c..b9e0e608d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,12 @@
                         <goals>
                             <goal>sign</goal>
                         </goals>
+                        <configuration>
+                            <gpgArguments>
+                                <arg>--pinentry-mode</arg>
+                                <arg>loopback</arg>
+                            </gpgArguments>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

From 3d524349a11f8af5142b00f6fc67b5294682be66 Mon Sep 17 00:00:00 2001
From: dburbrid <dburbrid@4L005165.mshome.net>
Date: Mon, 26 Jun 2023 09:33:03 +0100
Subject: [PATCH 5/5] Correction of bug when compiling/testing on Windows:
 Issue537 file must be read as UTF-8 (Issue 745)

---
 src/test/java/org/json/junit/XMLTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index aefaa49da..e940032e0 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -18,6 +18,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -915,7 +916,7 @@ public void testIssue537CaseSensitiveHexEscapeFullFile(){
             InputStream xmlStream = null;
             try {
                 xmlStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue537.xml");
-                Reader xmlReader = new InputStreamReader(xmlStream);
+                Reader xmlReader = new InputStreamReader(xmlStream, Charset.forName("UTF-8"));
                 JSONObject actual = XML.toJSONObject(xmlReader, true);
                 InputStream jsonStream = null;
                 try {