From 335f1692be0ba26e6249d7870cc2c7faa5772a16 Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Wed, 26 Oct 2022 10:32:37 +0200
Subject: Revert "No more org.json"

This reverts commit 282c257829f1104170421cb1a1bf25deb31cac71.
---
 cloud-tenant-base-dependencies-enforcer/pom.xml | 2 ++
 container-dev/pom.xml                           | 4 ++++
 container-test/pom.xml                          | 6 ++++++
 parent/pom.xml                                  | 6 ++++++
 4 files changed, 18 insertions(+)

diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 608d0604d45..115143da82a 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -46,6 +46,7 @@
         <jetty.version>9.4.49.v20220914</jetty.version>
         <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version>
         <org.lz4.version>1.8.0</org.lz4.version>
+        <org.json.version>20220320</org.json.version>
         <slf4j.version>1.7.32</slf4j.version> <!-- WARNING: when updated, also update c.y.v.tenant:base pom -->
         <xml-apis.version>1.4.01</xml-apis.version>
     </properties>
@@ -218,6 +219,7 @@
                                         <include>org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:test</include>
                                         <include>org.hamcrest:hamcrest-core:1.3:jar:test</include>
                                         <include>org.hdrhistogram:HdrHistogram:2.1.8:jar:test</include>
+                                        <include>org.json:json:${org.json.version}:jar:test</include>
                                         <include>org.junit.jupiter:junit-jupiter-api:[${junit5.version}]:jar:test</include>
                                         <include>org.junit.jupiter:junit-jupiter-engine:[${junit5.version}]:jar:test</include>
                                         <include>org.junit.platform:junit-platform-commons:[${junit5.platform.version}]:jar:test</include>
diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index 0c88531a248..8279a497e4a 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -207,6 +207,10 @@
           <groupId>org.apache.commons</groupId>
           <artifactId>commons-math3</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.json</groupId>
+          <artifactId>json</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.lz4</groupId>
           <artifactId>lz4-java</artifactId>
diff --git a/container-test/pom.xml b/container-test/pom.xml
index 2b1b20a9ed0..100fe749394 100644
--- a/container-test/pom.xml
+++ b/container-test/pom.xml
@@ -100,6 +100,12 @@
       <artifactId>commons-compress</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <!-- required for container-search code using org.json -->
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <!-- TODO: this, and probably others, could be removed from here if we make the fat jar the default artifact for jdisc_core -->
       <groupId>org.lz4</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 57c718ee4f5..b019db32e93 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -994,6 +994,11 @@
                 <artifactId>xercesImpl</artifactId>
                 <version>2.12.2</version>
             </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>${org.json.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1052,6 +1057,7 @@
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <mockito.version>4.0.0</mockito.version>
         <onnxruntime.version>1.12.1</onnxruntime.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml -->
+        <org.json.version>20220320</org.json.version>
         <org.lz4.version>1.8.0</org.lz4.version>
         <prometheus.client.version>0.6.0</prometheus.client.version>
         <protobuf.version>3.21.7</protobuf.version>
-- 
cgit v1.2.3