Stop exporting org.json (including removal of deprecated APIs)

14 files changed, 11 insertions, 55 deletions

diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 4b74a244389..468c0eb6bfe 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -43,7 +43,6 @@
         <jetty.version>9.4.46.v20220331</jetty.version>
         <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version>
         <org.lz4.version>1.8.0</org.lz4.version>
-        <org.json.version>20090211</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>
 
@@ -129,7 +128,6 @@
                                         <include>org.glassfish.jersey.core:jersey-common:[${jersey2.version}]:jar:provided</include>
                                         <include>org.glassfish.jersey.core:jersey-server:[${jersey2.version}]:jar:provided</include>
                                         <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include>
-                                        <include>org.json:json:[${org.json.version}]:jar:provided</include>
                                         <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include>
                                         <include>org.slf4j:log4j-over-slf4j:[${slf4j.version}]:jar:provided</include>
                                         <include>org.slf4j:slf4j-api:[${slf4j.version}]:jar:provided</include>
diff --git a/container-core/pom.xml b/container-core/pom.xml
index 294f6c0a585..54562ba71c4 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -111,11 +111,6 @@
       <groupId>org.hdrhistogram</groupId>
       <artifactId>HdrHistogram</artifactId>
     </dependency>
-    <dependency>
-      <!-- TODO Vespa 8: stop providing org.json:json -->
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-    </dependency>
 
     <!-- PROVIDED scope -->
     <dependency>
diff --git a/container-core/src/main/java/org/json/package-info.java b/container-core/src/main/java/org/json/package-info.java
deleted file mode 100644
index bacf02a3adc..00000000000
--- a/container-core/src/main/java/org/json/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package org.json;
-// TODO Vespa 8: stop providing org.json
-import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 6fdc6cef78c..634d5b7e395 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -109,7 +109,6 @@
                                         <include>org.glassfish.jersey.core:jersey-common:[${jersey2.version}]:jar:provided</include>
                                         <include>org.glassfish.jersey.core:jersey-server:[${jersey2.version}]:jar:provided</include>
                                         <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include>
-                                        <include>org.json:json:[${org.json.version}]:jar:provided</include>
                                         <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include>
                                         <include>org.slf4j:log4j-over-slf4j:[${slf4j.version}]:jar:provided</include>
                                         <include>org.slf4j:slf4j-api:[${slf4j.version}]:jar:provided</include>
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 31feb5d199a..d213331da9e 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -257,11 +257,6 @@
                 <artifactId>javassist</artifactId>
                 <version>${javassist.version}</version>
             </dependency>
-	        <dependency> <!-- TODO Vespa 8: remove as provided dependency and move to parent -->
-                <groupId>org.json</groupId>
-                <artifactId>json</artifactId>
-                <version>${org.json.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index 6268e1e6fb4..844fc26a6ef 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -165,6 +165,10 @@
           <groupId>org.apache.commons</groupId>
           <artifactId>commons-math3</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.json</groupId>
+          <artifactId>json</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index a94225f6b5e..6b086292f55 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -71,10 +71,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-    </dependency>
-    <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>component</artifactId>
       <version>${project.version}</version>
diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml
index e98b2a08662..9be054570e0 100644
--- a/container-search-and-docproc/pom.xml
+++ b/container-search-and-docproc/pom.xml
@@ -204,11 +204,6 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
     <!-- TEST scope -->
     <dependency>
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 54cdb4ea929..b6ffd061cba 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -177,8 +177,6 @@
       "public java.lang.String toString()",
       "public boolean fillWeightedSetItem(com.yahoo.prelude.query.WeightedSetItem)",
       "public java.lang.String getContent()",
-      "public java.lang.Object getParsedJSON()",
-      "public void setParsedJSON(java.lang.Object)",
       "public java.lang.String renderFromInspector()"
     ],
     "fields": []
diff --git a/container-search/pom.xml b/container-search/pom.xml
index 8005b4179e5..d410eb1c2c6 100644
--- a/container-search/pom.xml
+++ b/container-search/pom.xml
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <scope>provided</scope>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java
index 3b1b5d5e2d4..26fc067070b 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
  *
  * @author Steinar Knutsen
  */
-// TODO Vespa 8: remove methods leaking org.json types (replace with Slime equivalent?)
 public class JSONString implements Inspectable {
 
     private Inspector value;
@@ -439,21 +438,6 @@ public class JSONString implements Inspectable {
         return content;
     }
 
-    /** @deprecated Use {@link #getContent()} instead and parse content yourself */
-    @Deprecated(forRemoval = true, since = "7")
-    public Object getParsedJSON() {
-        initContent();
-        if (parsedJSON == null) {
-            initJSON();
-        }
-        return parsedJSON;
-    }
-
-    @Deprecated(forRemoval = true, since = "7")
-    public void setParsedJSON(Object parsedJSON) {
-        this.parsedJSON = parsedJSON;
-    }
-
     public String renderFromInspector() {
         return XmlRenderer.render(new StringBuilder(), value).toString();
     }
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
index a174bde3902..c39efe21e70 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
@@ -2,7 +2,6 @@
 package com.yahoo.prelude.fastsearch;
 
 import com.google.common.collect.ImmutableSet;
-import com.yahoo.config.subscription.ConfigGetter;
 import com.yahoo.data.access.slime.SlimeAdapter;
 import com.yahoo.prelude.hitfield.JSONString;
 import com.yahoo.prelude.hitfield.RawData;
@@ -101,7 +100,7 @@ public class SlimeSummaryTestCase {
         if (hit.getField("jsonstring_field") instanceof JSONString) {
             JSONString jstr = (JSONString) hit.getField("jsonstring_field");
             assertEquals("{\"foo\":1,\"bar\":2}", jstr.getContent());
-            assertNotNull(getParsedJSON(jstr));
+            assertNotNull(jstr.getContent());
 
             com.yahoo.data.access.Inspector value = jstr.inspect();
             assertEquals(1L, value.field("foo").asLong());
@@ -125,8 +124,6 @@ public class SlimeSummaryTestCase {
         assertEquals(tensor2, featureData.getTensor("tensor2_feature"));
     }
 
-    @SuppressWarnings("removal") private static Object getParsedJSON(JSONString jstr) { return jstr.getParsedJSON(); }
-
     @Test
     public void testFieldAccessAPI() {
         DocsumDefinitionSet partialDocsum1 = createPartialDocsumDefinitionSet1();
diff --git a/docprocs/pom.xml b/docprocs/pom.xml
index 962906a6949..7ad13ce83e1 100644
--- a/docprocs/pom.xml
+++ b/docprocs/pom.xml
@@ -104,10 +104,6 @@
           <groupId>com.yahoo.vespa</groupId>
           <artifactId>annotation</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.json</groupId>
-          <artifactId>json</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 24e9caf9aa9..d079760a1e9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -942,7 +942,6 @@
                 <artifactId>metrics-core</artifactId>
                 <version>3.2.5</version>
             </dependency>
-
             <dependency>
                 <groupId>uk.co.datumedge</groupId>
                 <artifactId>hamcrest-json</artifactId>
@@ -954,6 +953,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>