Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated org.json dependency #2593

Merged
merged 7 commits into from
Dec 18, 2023
Merged

Updated org.json dependency #2593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e43e11b
Updated org.json dependency
vladbailescu Oct 2, 2023
99060df
Merge branch 'main' into issue/org.json-update
LSantha Oct 17, 2023
6a01636
Merge branch 'main' into issue/org.json-update
vladbailescu Nov 17, 2023
4d7e524
Reverted vscode file
vladbailescu Nov 17, 2023
321d356
Removed org.apache.sling.commons.json dependency.
vladbailescu Dec 4, 2023
53be6ce
Update pom.xml
vladbailescu Dec 14, 2023
bd56d90
Merge branch 'main' into issue/org.json-update
vladbailescu Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
1 change: 0 additions & 1 deletion bundles/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,6 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.adobe.aem</groupId>
<artifactId>uber-jar</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions bundles/core/src/test/java/com/day/cq/wcm/foundation/forms/FormsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
12 changes: 12 additions & 0 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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.
Expand Down
Loading