From cf2a4f306be07c20a487adb71feced9b1d3ada1f Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Sun, 6 Mar 2016 09:17:42 +0000
Subject: [PATCH] Avoid breaking json-io updates

---
 .classpath                                 | 2 +-
 ivy.xml                                    | 2 +-
 source/net/filebot/util/JsonUtilities.java | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.classpath b/.classpath
index 62203667..05b225ac 100644
--- a/.classpath
+++ b/.classpath
@@ -28,7 +28,7 @@
 	<classpathentry kind="lib" path="lib/ivy/jar/commons-vfs2.jar"/>
 	<classpathentry kind="lib" path="lib/ivy/jar/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/ivy/jar/sevenzipjbinding.jar"/>
-	<classpathentry kind="lib" path="lib/ivy/bundle/json-io.jar"/>
+	<classpathentry kind="lib" path="lib/ivy/bundle/json-io.jar" sourcepath="lib/ivy/source/json-io.jar"/>
 	<classpathentry kind="lib" path="lib/ivy/jar/jna-platform.jar"/>
 	<classpathentry kind="lib" path="lib/ivy/jar/language-detector.jar"/>
 	<classpathentry kind="lib" path="lib/ivy/bundle/guava.jar"/>
diff --git a/ivy.xml b/ivy.xml
index cfbf69d4..eb5737d5 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -11,7 +11,7 @@
 		<dependency org="com.ibm.icu" name="icu4j" rev="56.+" />
 		<dependency org="org.jsoup" name="jsoup" rev="1.+" />
 		<dependency org="org.tukaani" name="xz" rev="1.+" />
-		<dependency org="com.cedarsoftware" name="json-io" rev="4.+" />
+		<dependency org="com.cedarsoftware" name="json-io" rev="4.3.+" />
 		<dependency org="com.googlecode.json-simple" name="json-simple" rev="1.+" />
 		<dependency org="commons-io" name="commons-io" rev="2.+" />
 		<dependency org="commons-net" name="commons-net" rev="3.+" />
diff --git a/source/net/filebot/util/JsonUtilities.java b/source/net/filebot/util/JsonUtilities.java
index ee2d3ff8..f4c9c3a3 100644
--- a/source/net/filebot/util/JsonUtilities.java
+++ b/source/net/filebot/util/JsonUtilities.java
@@ -1,5 +1,7 @@
 package net.filebot.util;
 
+import static java.util.Collections.*;
+
 import java.util.Map;
 
 import com.cedarsoftware.util.io.JsonReader;
@@ -7,7 +9,7 @@ import com.cedarsoftware.util.io.JsonReader;
 public class JsonUtilities {
 
 	public static Map<?, ?> readJson(String json) {
-		return JsonReader.jsonToMaps(json);
+		return (Map<?, ?>) JsonReader.jsonToJava(json, singletonMap(JsonReader.USE_MAPS, true));
 	}
 
 	public static Object[] getArray(Object node, String key) {