This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tooling-support-install.git
commit 595b44bce6129609676c1a408ed3fa578eb9f2b9 Author: Karl Pauls <[email protected]> AuthorDate: Thu Jun 1 20:04:44 2017 +0000 SLING-6907: Remove commons.json from Tooling Support Install git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1797257 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 16 +++++++++------- .../tooling/support/install/impl/InstallationResult.java | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 2615b24..d28e5ce 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,6 @@ <version>26</version> </parent> - <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.tooling.support.install</artifactId> <version>1.0.3-SNAPSHOT</version> <packaging>bundle</packaging> @@ -54,6 +53,9 @@ <Private-Package> org.apache.sling.tooling.support.install.impl </Private-Package> + <Embed-Dependency> + org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter.class + </Embed-Dependency> </instructions> </configuration> </plugin> @@ -82,12 +84,6 @@ <artifactId>org.osgi.compendium</artifactId> </dependency> <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.json</artifactId> - <version>2.0.6</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.4</version> @@ -105,5 +101,11 @@ <version>1.2.2</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.utils</artifactId> + <version>1.9.0</version> + <scope>provided</scope> + </dependency> </dependencies> </project> diff --git a/src/main/java/org/apache/sling/tooling/support/install/impl/InstallationResult.java b/src/main/java/org/apache/sling/tooling/support/install/impl/InstallationResult.java index c498d88..bd85870 100644 --- a/src/main/java/org/apache/sling/tooling/support/install/impl/InstallationResult.java +++ b/src/main/java/org/apache/sling/tooling/support/install/impl/InstallationResult.java @@ -16,11 +16,11 @@ */ package org.apache.sling.tooling.support.install.impl; +import java.io.IOException; import java.io.Writer; import org.apache.commons.lang.StringUtils; -import org.apache.sling.commons.json.JSONException; -import org.apache.sling.commons.json.io.JSONWriter; +import org.apache.felix.utils.json.JSONWriter; public class InstallationResult { @@ -42,7 +42,7 @@ public class InstallationResult { writer.key("message").value(message); } writer.endObject(); - } catch (JSONException e) { + } catch (IOException e) { // never happens throw new RuntimeException(e); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
