diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java
index 95f4875a8..11dc2b3d9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java
@@ -5,8 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.datatools.dumprestore;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.json.JsonObject;
-import javax.json.JsonString;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.jena.atlas.lib.EscapeStr;
@@ -16,7 +15,7 @@ import org.apache.jena.atlas.lib.EscapeStr;
* able to write to a different format.
*/
public abstract class DumpNode {
- public static DumpNode fromJson(JsonObject json) throws BadNodeException {
+ public static DumpNode fromJson(JsonNode json) throws BadNodeException {
if (json == null) {
return new DumpNullNode();
}
@@ -74,9 +73,9 @@ public abstract class DumpNode {
return (s == null) ? null : EscapeStr.unescapeStr(s);
}
- private static String getString(JsonObject json, String name) {
- JsonString jsString = json.getJsonString(name);
- return (jsString == null) ? null : json.getString(name);
+ private static String getString(JsonNode json, String name) {
+ JsonNode node = json.get(name);
+ return node == null ? null : node.asText();
}
public abstract String getValue();
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 5583e87e9..ae9b83161 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -203,6 +203,11 @@
jackson-core
2.7.4
+
org.apache.httpcomponents
@@ -254,11 +259,6 @@
freemarker
2.3.23
-
- org.glassfish
- javax.json
- 1.0.4
-
org.hibernate
jtidy
@@ -297,11 +297,6 @@
1.2.1
-
javax.mail
mail