Repository: wicket Updated Branches: refs/heads/master 113a54925 -> f25687ade
WICKET-6329 org.json migration issue Switch from com.tdunning:json to com.github.openjson:openjson Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f25687ad Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f25687ad Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f25687ad Branch: refs/heads/master Commit: f25687ade198b8e9dedf91d120c7f0d3ec0f1039 Parents: 113a549 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Mon Mar 6 21:44:54 2017 +0100 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Mon Mar 6 21:44:54 2017 +0100 ---------------------------------------------------------------------- pom.xml | 6 +++--- wicket-core/pom.xml | 4 ++-- .../org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java | 6 +++--- .../src/main/java/org/apache/wicket/ajax/json/JsonUtils.java | 6 +++--- .../wicket/extensions/ajax/markup/html/modal/ModalWindow.java | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f25687ad/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4a3d2cf..70cf8d4 100644 --- a/pom.xml +++ b/pom.xml @@ -405,9 +405,9 @@ <type>jar</type> </dependency> <dependency> - <groupId>com.tdunning</groupId> - <artifactId>json</artifactId> - <version>1.8</version> + <groupId>com.github.openjson</groupId> + <artifactId>openjson</artifactId> + <version>1.0.0</version> <type>jar</type> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/wicket/blob/f25687ad/wicket-core/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml index bcc8d1d..5349989 100644 --- a/wicket-core/pom.xml +++ b/wicket-core/pom.xml @@ -63,8 +63,8 @@ <artifactId>mockito-core</artifactId> </dependency> <dependency> - <groupId>com.tdunning</groupId> - <artifactId>json</artifactId> + <groupId>com.github.openjson</groupId> + <artifactId>openjson</artifactId> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/wicket/blob/f25687ad/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java index 36fa225..ae0857f3 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java @@ -18,6 +18,9 @@ package org.apache.wicket.ajax; import java.util.List; +import com.github.openjson.JSONArray; +import com.github.openjson.JSONException; +import com.github.openjson.JSONObject; import org.apache.wicket.Component; import org.apache.wicket.Page; import org.apache.wicket.WicketRuntimeException; @@ -41,9 +44,6 @@ import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.resource.CoreLibrariesContributor; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.time.Duration; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; /** * The base class for Wicket's default AJAX implementation. http://git-wip-us.apache.org/repos/asf/wicket/blob/f25687ad/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonUtils.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonUtils.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonUtils.java index 1a16962..a5df52d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonUtils.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonUtils.java @@ -19,9 +19,9 @@ package org.apache.wicket.ajax.json; import java.util.List; import java.util.Map; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; +import com.github.openjson.JSONArray; +import com.github.openjson.JSONException; +import com.github.openjson.JSONObject; /** * @since 6.0.0 http://git-wip-us.apache.org/repos/asf/wicket/blob/f25687ad/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java index c628b88..a8a70ef 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java @@ -16,6 +16,7 @@ */ package org.apache.wicket.extensions.ajax.markup.html.modal; +import com.github.openjson.JSONObject; import org.apache.wicket.Component; import org.apache.wicket.Page; import org.apache.wicket.WicketRuntimeException; @@ -43,7 +44,6 @@ import org.apache.wicket.resource.CoreLibrariesContributor; import org.apache.wicket.util.io.IClusterable; import org.apache.wicket.util.lang.EnumeratedType; import org.apache.wicket.util.string.AppendingStringBuffer; -import org.json.JSONObject; /** * Modal window component.
