Updated org.json dependency (#2593)

adobe · Dec 18, 2023 · 918d784 · 918d784
1 parent 35679bc
commit 918d784
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -93,7 +93,7 @@ For existing projects, take example from the [AEM Project Archetype](https://git
 
 Core Components | AEM as a Cloud Service | AEM 6.5   | Java SE | Maven
 ----------------|------------------------|-----------|---------|---------
-[2.23.4](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.23.4) | Continual | 6.5.17.0+ | 8, <br/>11 | 3.3.9+
+[2.23.5+](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.23.4) | Continual | 6.5.19.0+ | 8, <br/>11 | 3.3.9+
 
 For the requirements from previous Core Component releases, see [Historical System Requirements](VERSIONS.md).
 

diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
@@ -528,7 +528,6 @@
             <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>uber-jar</artifactId>

diff --git a/bundles/core/src/test/java/com/day/cq/wcm/foundation/forms/FormsHelper.java b/bundles/core/src/test/java/com/day/cq/wcm/foundation/forms/FormsHelper.java
@@ -20,7 +20,6 @@
 import org.apache.sling.api.request.RequestDispatcherOptions;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.commons.json.JSONException;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -183,9 +182,9 @@ public static String[] getValues(SlingHttpServletRequest request, String name, S
         return null;
     }
 
-    public static void inlineValuesAsJson(SlingHttpServletRequest request, Writer out, String path) throws IOException, RepositoryException, JSONException {}
+    public static void inlineValuesAsJson(SlingHttpServletRequest request, Writer out, String path) throws IOException, RepositoryException {}
 
-    public static void inlineValuesAsJson(SlingHttpServletRequest request, Writer out, String path, int nodeDepth) throws IOException, RepositoryException, JSONException {}
+    public static void inlineValuesAsJson(SlingHttpServletRequest request, Writer out, String path, int nodeDepth) throws IOException, RepositoryException {}
 
     private static void accumulateShowHideExpressions(Node node, Map<String, String> map) throws RepositoryException {}
 

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -515,6 +515,11 @@
                     <url>https://repo.adobe.com/nexus/content/groups/public/</url>
                     <layout>default</layout>
                 </repository>
+                <repository>
+                    <id>central</id>
+                    <name>Maven Repository Switchboard</name>
+                    <url>http://repo1.maven.org/maven2</url>
+                </repository>
             </repositories>
 
             <pluginRepositories>
@@ -744,6 +749,13 @@
                 <scope>provided</scope>
             </dependency>
 
+            <dependency>
+                <groupId>com.adobe.granite.bundles</groupId>
+                <artifactId>json</artifactId>
+                <version>20230618_2</version>
+                <scope>provided</scope>
+            </dependency>
+
             <!--
                 AEM APIs; make sure to not move this bundle upper in the list so that newer APIs available in AEM but not in the Uber
                 Jar can be used as dependencies.