From a00a1b6a2ff0d85ea6decaac034c693c15bc3932 Mon Sep 17 00:00:00 2001
From: Naman Jain <54635559+njain2208@users.noreply.github.com>
Date: Thu, 30 Nov 2023 01:13:24 -0600
Subject: [PATCH 1/3] Update pom.xml

---
 tika-app/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index f6af9fc7d6..6422b7aebf 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -92,6 +92,17 @@
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
+    <dependency>
+          <groupId>com.google.flatbuffers</groupId>
+          <artifactId>flatbuffers-java</artifactId>
+          <version>1.12.0</version>
+          <scope>test</scope>
+      </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

From 330c9f18ee38d0752d874e6be33528a08da22303 Mon Sep 17 00:00:00 2001
From: Naman Jain <54635559+njain2208@users.noreply.github.com>
Date: Thu, 30 Nov 2023 01:19:29 -0600
Subject: [PATCH 2/3] Update TikaCLITest.java

---
 .../java/org/apache/tika/cli/TikaCLITest.java   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
index b8795225b6..862fcb2e36 100644
--- a/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
+++ b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
@@ -248,16 +248,23 @@ public void testMetadataOutput() throws Exception {
     public void testJsonMetadataOutput() throws Exception {
         String json = getParamOutContent("--json", "--digest=MD2",
                 resourcePrefix + "testJsonMultipleInts.html");
+        
+        Map<String, Object> jsonMap = new Gson().fromJson(json, Map.class);
+        // Sort properties alphabetically
+        Map<String, Object> sortedJsonMap = new TreeMap<>(jsonMap);
+        // Convert back to JSON string
+        String newJson = new Gson().toJson(sortedJsonMap);
+
         //TIKA-1310
-        assertTrue(json.contains("\"fb:admins\":\"1,2,3,4\","));
+        assertTrue(newJson.contains("\"fb:admins\":\"1,2,3,4\","));
 
         //test legacy alphabetic sort of keys
-        int enc = json.indexOf("\"Content-Encoding\"");
-        int fb = json.indexOf("fb:admins");
-        int title = json.indexOf("\"dc:title\"");
+        int enc = newJson.indexOf("\"Content-Encoding\"");
+        int fb = newJson.indexOf("fb:admins");
+        int title = newJson.indexOf("\"dc:title\"");
         assertTrue(enc > -1 && fb > -1 && enc < fb);
         assertTrue(fb > -1 && title > -1 && fb > title);
-        assertTrue(json.contains("\"X-TIKA:digest:MD2\":"));
+        assertTrue(newJson.contains("\"X-TIKA:digest:MD2\":"));
     }
 
     /**

From 8fce6e9afcc6872e0d5cdfac08ccd2c7dfd7d0b0 Mon Sep 17 00:00:00 2001
From: Naman Jain <54635559+njain2208@users.noreply.github.com>
Date: Thu, 30 Nov 2023 01:21:12 -0600
Subject: [PATCH 3/3] Update TikaCLITest.java

---
 tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
index 862fcb2e36..98edd7fcc8 100644
--- a/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
+++ b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
@@ -29,7 +29,10 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Map;
+import java.util.TreeMap;
 
+import com.google.gson.Gson;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;