diff --git a/pom.xml b/pom.xml
index f1f9b07a..b3756371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,11 @@
     </developer>
   </developers>
 
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
   <parent>
     <groupId>org.sonatype.oss</groupId>
     <artifactId>oss-parent</artifactId>
@@ -38,7 +43,6 @@
   </parent>
 
   <dependencies>
-
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
@@ -52,10 +56,9 @@
     </dependency>
 
     <dependency>
-      <groupId>net.sf.json-lib</groupId>
-      <artifactId>json-lib</artifactId>
-      <version>2.4</version>
-      <classifier>jdk15</classifier>
+      <groupId>org.kordamp.json</groupId>
+      <artifactId>json-lib-core</artifactId>
+      <version>3.0.1</version>
     </dependency>
 
     <dependency>
@@ -91,6 +94,5 @@
       <version>2.4.6</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 </project>
diff --git a/src/main/java/net/rcarz/jiraclient/Attachment.java b/src/main/java/net/rcarz/jiraclient/Attachment.java
index b5a4fc34..f14662c1 100644
--- a/src/main/java/net/rcarz/jiraclient/Attachment.java
+++ b/src/main/java/net/rcarz/jiraclient/Attachment.java
@@ -25,8 +25,8 @@
 import java.util.Date;
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
diff --git a/src/main/java/net/rcarz/jiraclient/ChangeLog.java b/src/main/java/net/rcarz/jiraclient/ChangeLog.java
index c39219c3..ab91cb31 100644
--- a/src/main/java/net/rcarz/jiraclient/ChangeLog.java
+++ b/src/main/java/net/rcarz/jiraclient/ChangeLog.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Issue change log.
diff --git a/src/main/java/net/rcarz/jiraclient/ChangeLogEntry.java b/src/main/java/net/rcarz/jiraclient/ChangeLogEntry.java
index 4d4fd1dc..6386919a 100644
--- a/src/main/java/net/rcarz/jiraclient/ChangeLogEntry.java
+++ b/src/main/java/net/rcarz/jiraclient/ChangeLogEntry.java
@@ -19,7 +19,7 @@
 
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 import java.util.Date;
 import java.util.List;
diff --git a/src/main/java/net/rcarz/jiraclient/ChangeLogItem.java b/src/main/java/net/rcarz/jiraclient/ChangeLogItem.java
index b761a289..f7f0cc4a 100644
--- a/src/main/java/net/rcarz/jiraclient/ChangeLogItem.java
+++ b/src/main/java/net/rcarz/jiraclient/ChangeLogItem.java
@@ -21,7 +21,7 @@
 
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Item in a {@link ChangeLogEntry}.
diff --git a/src/main/java/net/rcarz/jiraclient/Comment.java b/src/main/java/net/rcarz/jiraclient/Comment.java
index e6b031d8..6558eefc 100644
--- a/src/main/java/net/rcarz/jiraclient/Comment.java
+++ b/src/main/java/net/rcarz/jiraclient/Comment.java
@@ -19,8 +19,8 @@
 
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 import java.util.Date;
 import java.util.Map;
diff --git a/src/main/java/net/rcarz/jiraclient/Component.java b/src/main/java/net/rcarz/jiraclient/Component.java
index 5e197cf3..f7544893 100644
--- a/src/main/java/net/rcarz/jiraclient/Component.java
+++ b/src/main/java/net/rcarz/jiraclient/Component.java
@@ -23,8 +23,8 @@
 import java.util.Map;
 
 import net.rcarz.jiraclient.Issue.FluentCreate;
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an issue component.
diff --git a/src/main/java/net/rcarz/jiraclient/CustomFieldOption.java b/src/main/java/net/rcarz/jiraclient/CustomFieldOption.java
index cc9441c8..350509f8 100644
--- a/src/main/java/net/rcarz/jiraclient/CustomFieldOption.java
+++ b/src/main/java/net/rcarz/jiraclient/CustomFieldOption.java
@@ -21,8 +21,8 @@
 
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an custom field option.
diff --git a/src/main/java/net/rcarz/jiraclient/Field.java b/src/main/java/net/rcarz/jiraclient/Field.java
index 29a28414..763342bb 100644
--- a/src/main/java/net/rcarz/jiraclient/Field.java
+++ b/src/main/java/net/rcarz/jiraclient/Field.java
@@ -30,9 +30,9 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import net.sf.json.JSONNull;
+import org.kordamp.json.JSONArray;
+import org.kordamp.json.JSONObject;
+import org.kordamp.json.JSONNull;
 
 /**
  * Utility functions for translating between JSON and fields.
diff --git a/src/main/java/net/rcarz/jiraclient/Filter.java b/src/main/java/net/rcarz/jiraclient/Filter.java
index f2756f92..ca01a897 100644
--- a/src/main/java/net/rcarz/jiraclient/Filter.java
+++ b/src/main/java/net/rcarz/jiraclient/Filter.java
@@ -1,7 +1,7 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 import java.net.URI;
 import java.util.Map;
diff --git a/src/main/java/net/rcarz/jiraclient/Issue.java b/src/main/java/net/rcarz/jiraclient/Issue.java
index f3dfc4a1..da66ffe4 100644
--- a/src/main/java/net/rcarz/jiraclient/Issue.java
+++ b/src/main/java/net/rcarz/jiraclient/Issue.java
@@ -27,9 +27,9 @@
 import java.util.*;
 
 import net.rcarz.utils.WorklogUtils;
-import net.sf.json.JSON;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONArray;
+import org.kordamp.json.JSONObject;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
diff --git a/src/main/java/net/rcarz/jiraclient/IssueHistory.java b/src/main/java/net/rcarz/jiraclient/IssueHistory.java
index 1c0dd508..ffa45400 100644
--- a/src/main/java/net/rcarz/jiraclient/IssueHistory.java
+++ b/src/main/java/net/rcarz/jiraclient/IssueHistory.java
@@ -6,8 +6,8 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONArray;
+import org.kordamp.json.JSONObject;
 
 public class IssueHistory extends Resource {
 
diff --git a/src/main/java/net/rcarz/jiraclient/IssueHistoryItem.java b/src/main/java/net/rcarz/jiraclient/IssueHistoryItem.java
index 0373dfc2..fd240199 100644
--- a/src/main/java/net/rcarz/jiraclient/IssueHistoryItem.java
+++ b/src/main/java/net/rcarz/jiraclient/IssueHistoryItem.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 public class IssueHistoryItem extends Resource {
 
diff --git a/src/main/java/net/rcarz/jiraclient/IssueLink.java b/src/main/java/net/rcarz/jiraclient/IssueLink.java
index e3eaa723..9c5d3940 100644
--- a/src/main/java/net/rcarz/jiraclient/IssueLink.java
+++ b/src/main/java/net/rcarz/jiraclient/IssueLink.java
@@ -21,8 +21,8 @@
 
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an issue link.
diff --git a/src/main/java/net/rcarz/jiraclient/IssueType.java b/src/main/java/net/rcarz/jiraclient/IssueType.java
index 0359cfd8..5a27f50b 100644
--- a/src/main/java/net/rcarz/jiraclient/IssueType.java
+++ b/src/main/java/net/rcarz/jiraclient/IssueType.java
@@ -21,8 +21,8 @@
 
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an issue type.
diff --git a/src/main/java/net/rcarz/jiraclient/JiraClient.java b/src/main/java/net/rcarz/jiraclient/JiraClient.java
index 276b8d7c..5879c847 100644
--- a/src/main/java/net/rcarz/jiraclient/JiraClient.java
+++ b/src/main/java/net/rcarz/jiraclient/JiraClient.java
@@ -31,9 +31,9 @@
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.PoolingClientConnectionManager;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONArray;
+import org.kordamp.json.JSONObject;
 
 /**
  * A simple JIRA REST client.
diff --git a/src/main/java/net/rcarz/jiraclient/LinkType.java b/src/main/java/net/rcarz/jiraclient/LinkType.java
index 27670bf0..df940852 100644
--- a/src/main/java/net/rcarz/jiraclient/LinkType.java
+++ b/src/main/java/net/rcarz/jiraclient/LinkType.java
@@ -21,8 +21,8 @@
 
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an issue link type.
diff --git a/src/main/java/net/rcarz/jiraclient/Priority.java b/src/main/java/net/rcarz/jiraclient/Priority.java
index fcad1f0f..b45e1850 100644
--- a/src/main/java/net/rcarz/jiraclient/Priority.java
+++ b/src/main/java/net/rcarz/jiraclient/Priority.java
@@ -21,8 +21,8 @@
 
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an issue priority.
diff --git a/src/main/java/net/rcarz/jiraclient/Project.java b/src/main/java/net/rcarz/jiraclient/Project.java
index 6a917c42..4dc42e88 100644
--- a/src/main/java/net/rcarz/jiraclient/Project.java
+++ b/src/main/java/net/rcarz/jiraclient/Project.java
@@ -25,9 +25,9 @@
 import java.util.Map;
 import static net.rcarz.jiraclient.Resource.getBaseUri;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONArray;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents a JIRA project.
diff --git a/src/main/java/net/rcarz/jiraclient/ProjectCategory.java b/src/main/java/net/rcarz/jiraclient/ProjectCategory.java
index 1c7c48a3..00351bd6 100644
--- a/src/main/java/net/rcarz/jiraclient/ProjectCategory.java
+++ b/src/main/java/net/rcarz/jiraclient/ProjectCategory.java
@@ -21,8 +21,8 @@
 
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents a project category.
diff --git a/src/main/java/net/rcarz/jiraclient/RemoteLink.java b/src/main/java/net/rcarz/jiraclient/RemoteLink.java
index 50db09ad..1881568e 100644
--- a/src/main/java/net/rcarz/jiraclient/RemoteLink.java
+++ b/src/main/java/net/rcarz/jiraclient/RemoteLink.java
@@ -1,7 +1,7 @@
 package net.rcarz.jiraclient;
 
 import java.util.Map;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 public class RemoteLink extends Resource {
     private String remoteUrl;
diff --git a/src/main/java/net/rcarz/jiraclient/Resolution.java b/src/main/java/net/rcarz/jiraclient/Resolution.java
index 3e5a2fda..0fa80328 100644
--- a/src/main/java/net/rcarz/jiraclient/Resolution.java
+++ b/src/main/java/net/rcarz/jiraclient/Resolution.java
@@ -21,8 +21,8 @@
 
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an issue resolution.
diff --git a/src/main/java/net/rcarz/jiraclient/RestClient.java b/src/main/java/net/rcarz/jiraclient/RestClient.java
index e0ccceab..c92ca7bb 100644
--- a/src/main/java/net/rcarz/jiraclient/RestClient.java
+++ b/src/main/java/net/rcarz/jiraclient/RestClient.java
@@ -19,9 +19,9 @@
 
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
-import net.sf.json.JSONSerializer;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
+import org.kordamp.json.JSONSerializer;
 
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
diff --git a/src/main/java/net/rcarz/jiraclient/Security.java b/src/main/java/net/rcarz/jiraclient/Security.java
index 33210b8e..79a04b00 100755
--- a/src/main/java/net/rcarz/jiraclient/Security.java
+++ b/src/main/java/net/rcarz/jiraclient/Security.java
@@ -21,8 +21,8 @@
 
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an issue security.
diff --git a/src/main/java/net/rcarz/jiraclient/Status.java b/src/main/java/net/rcarz/jiraclient/Status.java
index 757a8ab6..1221e82e 100644
--- a/src/main/java/net/rcarz/jiraclient/Status.java
+++ b/src/main/java/net/rcarz/jiraclient/Status.java
@@ -21,8 +21,8 @@
 
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an issue status.
diff --git a/src/main/java/net/rcarz/jiraclient/TimeTracking.java b/src/main/java/net/rcarz/jiraclient/TimeTracking.java
index 4a18f495..5fc9854c 100644
--- a/src/main/java/net/rcarz/jiraclient/TimeTracking.java
+++ b/src/main/java/net/rcarz/jiraclient/TimeTracking.java
@@ -21,7 +21,7 @@
 
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents issue time tracking data.
diff --git a/src/main/java/net/rcarz/jiraclient/TokenCredentials.java b/src/main/java/net/rcarz/jiraclient/TokenCredentials.java
index f6efca4a..a0244f33 100644
--- a/src/main/java/net/rcarz/jiraclient/TokenCredentials.java
+++ b/src/main/java/net/rcarz/jiraclient/TokenCredentials.java
@@ -19,8 +19,8 @@
 
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 import org.apache.http.HttpRequest;
 
diff --git a/src/main/java/net/rcarz/jiraclient/Transition.java b/src/main/java/net/rcarz/jiraclient/Transition.java
index fec1fb2a..8b623bd8 100644
--- a/src/main/java/net/rcarz/jiraclient/Transition.java
+++ b/src/main/java/net/rcarz/jiraclient/Transition.java
@@ -19,7 +19,7 @@
 
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 import java.util.Map;
 
 /**
diff --git a/src/main/java/net/rcarz/jiraclient/User.java b/src/main/java/net/rcarz/jiraclient/User.java
index d35c5f81..560613cd 100644
--- a/src/main/java/net/rcarz/jiraclient/User.java
+++ b/src/main/java/net/rcarz/jiraclient/User.java
@@ -19,8 +19,8 @@
 
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/net/rcarz/jiraclient/Version.java b/src/main/java/net/rcarz/jiraclient/Version.java
index 3e1d156b..0ce6fe14 100644
--- a/src/main/java/net/rcarz/jiraclient/Version.java
+++ b/src/main/java/net/rcarz/jiraclient/Version.java
@@ -19,8 +19,8 @@
 
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/src/main/java/net/rcarz/jiraclient/Visibility.java b/src/main/java/net/rcarz/jiraclient/Visibility.java
index 2cb0a70d..dc774582 100644
--- a/src/main/java/net/rcarz/jiraclient/Visibility.java
+++ b/src/main/java/net/rcarz/jiraclient/Visibility.java
@@ -1,6 +1,6 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 import java.util.Map;
 
diff --git a/src/main/java/net/rcarz/jiraclient/Votes.java b/src/main/java/net/rcarz/jiraclient/Votes.java
index bfbb1535..f7537030 100644
--- a/src/main/java/net/rcarz/jiraclient/Votes.java
+++ b/src/main/java/net/rcarz/jiraclient/Votes.java
@@ -19,8 +19,8 @@
 
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 import java.util.Map;
 
diff --git a/src/main/java/net/rcarz/jiraclient/Watches.java b/src/main/java/net/rcarz/jiraclient/Watches.java
index c5383ec6..ae3a8273 100644
--- a/src/main/java/net/rcarz/jiraclient/Watches.java
+++ b/src/main/java/net/rcarz/jiraclient/Watches.java
@@ -19,8 +19,8 @@
 
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/net/rcarz/jiraclient/WorkLog.java b/src/main/java/net/rcarz/jiraclient/WorkLog.java
index 50b48c95..fcc5e222 100644
--- a/src/main/java/net/rcarz/jiraclient/WorkLog.java
+++ b/src/main/java/net/rcarz/jiraclient/WorkLog.java
@@ -23,8 +23,8 @@
 import java.util.Date;
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an issue work log.
diff --git a/src/main/java/net/rcarz/jiraclient/agile/AgileResource.java b/src/main/java/net/rcarz/jiraclient/agile/AgileResource.java
index 8700618e..2a1d9af6 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/AgileResource.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/AgileResource.java
@@ -22,10 +22,10 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSON;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import org.apache.commons.lang.math.NumberUtils;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONArray;
+import org.kordamp.json.JSONObject;
+import org.apache.commons.lang3.math.NumberUtils;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
diff --git a/src/main/java/net/rcarz/jiraclient/agile/Board.java b/src/main/java/net/rcarz/jiraclient/agile/Board.java
index 4db6aeca..2b2b6d20 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/Board.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/Board.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 import java.util.List;
 
diff --git a/src/main/java/net/rcarz/jiraclient/agile/Comment.java b/src/main/java/net/rcarz/jiraclient/agile/Comment.java
index c42b757e..c93798b0 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/Comment.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/Comment.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 import java.util.Date;
 
diff --git a/src/main/java/net/rcarz/jiraclient/agile/Epic.java b/src/main/java/net/rcarz/jiraclient/agile/Epic.java
index 65315721..b7a12471 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/Epic.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/Epic.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 import java.util.List;
 
diff --git a/src/main/java/net/rcarz/jiraclient/agile/Issue.java b/src/main/java/net/rcarz/jiraclient/agile/Issue.java
index 5b2c4a8a..c3ab5ac2 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/Issue.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/Issue.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 import java.util.Date;
 import java.util.List;
diff --git a/src/main/java/net/rcarz/jiraclient/agile/IssueType.java b/src/main/java/net/rcarz/jiraclient/agile/IssueType.java
index 47c97e82..7dec315e 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/IssueType.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/IssueType.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an Agile IssueType.
diff --git a/src/main/java/net/rcarz/jiraclient/agile/Priority.java b/src/main/java/net/rcarz/jiraclient/agile/Priority.java
index 9cc7df06..343c0bcd 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/Priority.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/Priority.java
@@ -21,7 +21,7 @@
 
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an Agile Priority.
diff --git a/src/main/java/net/rcarz/jiraclient/agile/Project.java b/src/main/java/net/rcarz/jiraclient/agile/Project.java
index 499758bf..8957e659 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/Project.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/Project.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an Agile Project.
diff --git a/src/main/java/net/rcarz/jiraclient/agile/Resolution.java b/src/main/java/net/rcarz/jiraclient/agile/Resolution.java
index aa15aa70..b1482e1f 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/Resolution.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/Resolution.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an Agile Resolution.
diff --git a/src/main/java/net/rcarz/jiraclient/agile/Sprint.java b/src/main/java/net/rcarz/jiraclient/agile/Sprint.java
index ac20f63d..381770ac 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/Sprint.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/Sprint.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 import java.util.Date;
 import java.util.List;
diff --git a/src/main/java/net/rcarz/jiraclient/agile/Status.java b/src/main/java/net/rcarz/jiraclient/agile/Status.java
index 88d802d6..0920fdee 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/Status.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/Status.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an Agile Status.
diff --git a/src/main/java/net/rcarz/jiraclient/agile/TimeTracking.java b/src/main/java/net/rcarz/jiraclient/agile/TimeTracking.java
index 98f19fd2..54e49017 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/TimeTracking.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/TimeTracking.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an Agile TimeTracking.
diff --git a/src/main/java/net/rcarz/jiraclient/agile/User.java b/src/main/java/net/rcarz/jiraclient/agile/User.java
index e81a58f0..b008e0bf 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/User.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/User.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents an Agile User.
diff --git a/src/main/java/net/rcarz/jiraclient/agile/Worklog.java b/src/main/java/net/rcarz/jiraclient/agile/Worklog.java
index c1a23890..6bbc1d32 100644
--- a/src/main/java/net/rcarz/jiraclient/agile/Worklog.java
+++ b/src/main/java/net/rcarz/jiraclient/agile/Worklog.java
@@ -22,7 +22,7 @@
 import net.rcarz.jiraclient.Field;
 import net.rcarz.jiraclient.JiraException;
 import net.rcarz.jiraclient.RestClient;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 import java.util.Date;
 
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/Backlog.java b/src/main/java/net/rcarz/jiraclient/greenhopper/Backlog.java
index 7641e256..0e1f4eb7 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/Backlog.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/Backlog.java
@@ -29,9 +29,9 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONArray;
+import org.kordamp.json.JSONObject;
 
 /**
  * GreenHopper backlog data.
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/Epic.java b/src/main/java/net/rcarz/jiraclient/greenhopper/Epic.java
index bb32f296..4d9e13d4 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/Epic.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/Epic.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents a GreenHopper epic issue.
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/EpicStats.java b/src/main/java/net/rcarz/jiraclient/greenhopper/EpicStats.java
index 68cf5728..f24632bb 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/EpicStats.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/EpicStats.java
@@ -23,7 +23,7 @@
 
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * GreenHopper epic statistics.
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/EstimateStatistic.java b/src/main/java/net/rcarz/jiraclient/greenhopper/EstimateStatistic.java
index 63408314..e5cdae2d 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/EstimateStatistic.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/EstimateStatistic.java
@@ -23,7 +23,7 @@
 
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * GreenHopper estimate statistics for rapid views.
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/EstimateSum.java b/src/main/java/net/rcarz/jiraclient/greenhopper/EstimateSum.java
index 190cba4d..f8262b51 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/EstimateSum.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/EstimateSum.java
@@ -23,7 +23,7 @@
 
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * GreenHopper estimate sum for rapid views.
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/GreenHopperField.java b/src/main/java/net/rcarz/jiraclient/greenhopper/GreenHopperField.java
index e3e8b7eb..ea2e1c82 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/GreenHopperField.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/GreenHopperField.java
@@ -24,8 +24,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONArray;
+import org.kordamp.json.JSONObject;
 
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/GreenHopperIssue.java b/src/main/java/net/rcarz/jiraclient/greenhopper/GreenHopperIssue.java
index bce035fa..1a4bf3a1 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/GreenHopperIssue.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/GreenHopperIssue.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * A base class for GreenHopper issues.
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/Marker.java b/src/main/java/net/rcarz/jiraclient/greenhopper/Marker.java
index a9c4698e..19fc4e5c 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/Marker.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/Marker.java
@@ -24,7 +24,7 @@
 
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents a GreenHopper marker (a sprint that hasn't started).
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/RapidView.java b/src/main/java/net/rcarz/jiraclient/greenhopper/RapidView.java
index 2883f26e..fb0e9f2e 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/RapidView.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/RapidView.java
@@ -26,9 +26,9 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONArray;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents a GreenHopper Rapid Board.
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/RapidViewProject.java b/src/main/java/net/rcarz/jiraclient/greenhopper/RapidViewProject.java
index 4a3d9527..1d260dc3 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/RapidViewProject.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/RapidViewProject.java
@@ -26,7 +26,7 @@
 
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents a GreenHopper JIRA project.
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/RapidViewVersion.java b/src/main/java/net/rcarz/jiraclient/greenhopper/RapidViewVersion.java
index 104b52b3..3f07e5ef 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/RapidViewVersion.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/RapidViewVersion.java
@@ -26,7 +26,7 @@
 
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents a GreenHopper JIRA project version.
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/Sprint.java b/src/main/java/net/rcarz/jiraclient/greenhopper/Sprint.java
index bb0e6602..8fad5e9a 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/Sprint.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/Sprint.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 import org.joda.time.DateTime;
 
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/SprintIssue.java b/src/main/java/net/rcarz/jiraclient/greenhopper/SprintIssue.java
index 8fcc931e..281aeb71 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/SprintIssue.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/SprintIssue.java
@@ -24,7 +24,7 @@
 
 import java.util.Map;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 
 /**
  * Represents a GreenHopper sprint issue.
diff --git a/src/main/java/net/rcarz/jiraclient/greenhopper/SprintReport.java b/src/main/java/net/rcarz/jiraclient/greenhopper/SprintReport.java
index 8d8d61f5..c2c35e58 100644
--- a/src/main/java/net/rcarz/jiraclient/greenhopper/SprintReport.java
+++ b/src/main/java/net/rcarz/jiraclient/greenhopper/SprintReport.java
@@ -29,8 +29,8 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
 
 /**
  * GreenHopper sprint statistics.
diff --git a/src/test/groovy/net/rcarz/jiraclient/agile/AbstractResourceTest.groovy b/src/test/groovy/net/rcarz/jiraclient/agile/AbstractResourceTest.groovy
index d60ec19d..9b1d5ea6 100644
--- a/src/test/groovy/net/rcarz/jiraclient/agile/AbstractResourceTest.groovy
+++ b/src/test/groovy/net/rcarz/jiraclient/agile/AbstractResourceTest.groovy
@@ -2,8 +2,8 @@ package net.rcarz.jiraclient.agile
 
 import net.rcarz.jiraclient.JiraClient
 import net.rcarz.jiraclient.RestClient
-import net.sf.json.JSONObject
-import net.sf.json.JSONSerializer
+import org.kordamp.json.JSONObject
+import org.kordamp.json.JSONSerializer
 import org.hamcrest.core.IsEqual
 import org.hamcrest.core.IsNot
 import org.hamcrest.core.IsNull
diff --git a/src/test/groovy/net/rcarz/jiraclient/agile/AgileClientTest.groovy b/src/test/groovy/net/rcarz/jiraclient/agile/AgileClientTest.groovy
index c64db743..1f3efb4b 100644
--- a/src/test/groovy/net/rcarz/jiraclient/agile/AgileClientTest.groovy
+++ b/src/test/groovy/net/rcarz/jiraclient/agile/AgileClientTest.groovy
@@ -1,6 +1,6 @@
 package net.rcarz.jiraclient.agile
 
-import net.sf.json.JSONSerializer
+import org.kordamp.json.JSONSerializer
 import org.hamcrest.core.IsEqual
 import org.hamcrest.core.IsNot
 import org.hamcrest.core.IsNull
diff --git a/src/test/groovy/net/rcarz/jiraclient/agile/AgileResourceTest.groovy b/src/test/groovy/net/rcarz/jiraclient/agile/AgileResourceTest.groovy
index 88eeb2b5..1a2d6734 100644
--- a/src/test/groovy/net/rcarz/jiraclient/agile/AgileResourceTest.groovy
+++ b/src/test/groovy/net/rcarz/jiraclient/agile/AgileResourceTest.groovy
@@ -1,7 +1,7 @@
 package net.rcarz.jiraclient.agile
 
 import net.rcarz.jiraclient.JiraException
-import net.sf.json.JSONSerializer
+import org.kordamp.json.JSONSerializer
 import org.hamcrest.core.IsNot
 import org.hamcrest.core.IsNull
 import org.junit.Rule
diff --git a/src/test/groovy/net/rcarz/jiraclient/agile/BoardTest.groovy b/src/test/groovy/net/rcarz/jiraclient/agile/BoardTest.groovy
index dbd78375..e5072499 100644
--- a/src/test/groovy/net/rcarz/jiraclient/agile/BoardTest.groovy
+++ b/src/test/groovy/net/rcarz/jiraclient/agile/BoardTest.groovy
@@ -3,8 +3,8 @@ package net.rcarz.jiraclient.agile
 import net.rcarz.jiraclient.JiraException
 import net.rcarz.jiraclient.RestClient
 import net.rcarz.jiraclient.RestException
-import net.sf.json.JSONObject
-import net.sf.json.JSONSerializer
+import org.kordamp.json.JSONObject
+import org.kordamp.json.JSONSerializer
 import org.hamcrest.core.IsEqual
 import org.hamcrest.core.IsNot
 import org.hamcrest.core.IsNull
diff --git a/src/test/groovy/net/rcarz/jiraclient/agile/EpicTest.groovy b/src/test/groovy/net/rcarz/jiraclient/agile/EpicTest.groovy
index 5563a0f5..b1a7ade2 100644
--- a/src/test/groovy/net/rcarz/jiraclient/agile/EpicTest.groovy
+++ b/src/test/groovy/net/rcarz/jiraclient/agile/EpicTest.groovy
@@ -3,8 +3,8 @@ package net.rcarz.jiraclient.agile
 import net.rcarz.jiraclient.JiraException
 import net.rcarz.jiraclient.RestClient
 import net.rcarz.jiraclient.RestException
-import net.sf.json.JSONObject
-import net.sf.json.JSONSerializer
+import org.kordamp.json.JSONObject
+import org.kordamp.json.JSONSerializer
 import org.hamcrest.core.IsEqual
 import org.hamcrest.core.IsNot
 import org.hamcrest.core.IsNull
diff --git a/src/test/groovy/net/rcarz/jiraclient/agile/IssueTest.groovy b/src/test/groovy/net/rcarz/jiraclient/agile/IssueTest.groovy
index 217ed1cc..f35bc8aa 100644
--- a/src/test/groovy/net/rcarz/jiraclient/agile/IssueTest.groovy
+++ b/src/test/groovy/net/rcarz/jiraclient/agile/IssueTest.groovy
@@ -3,7 +3,7 @@ package net.rcarz.jiraclient.agile
 import net.rcarz.jiraclient.JiraException
 import net.rcarz.jiraclient.RestClient
 import net.rcarz.jiraclient.RestException
-import net.sf.json.JSONSerializer
+import org.kordamp.json.JSONSerializer
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.ExpectedException
diff --git a/src/test/groovy/net/rcarz/jiraclient/agile/SprintTest.groovy b/src/test/groovy/net/rcarz/jiraclient/agile/SprintTest.groovy
index 693cd404..5ff06035 100644
--- a/src/test/groovy/net/rcarz/jiraclient/agile/SprintTest.groovy
+++ b/src/test/groovy/net/rcarz/jiraclient/agile/SprintTest.groovy
@@ -3,8 +3,8 @@ package net.rcarz.jiraclient.agile
 import net.rcarz.jiraclient.JiraException
 import net.rcarz.jiraclient.RestClient
 import net.rcarz.jiraclient.RestException
-import net.sf.json.JSONObject
-import net.sf.json.JSONSerializer
+import org.kordamp.json.JSONObject
+import org.kordamp.json.JSONSerializer
 import org.hamcrest.core.IsEqual
 import org.hamcrest.core.IsNot
 import org.hamcrest.core.IsNull
diff --git a/src/test/java/net/rcarz/jiraclient/IssueTest.java b/src/test/java/net/rcarz/jiraclient/IssueTest.java
index ff81fecd..48c8af7c 100644
--- a/src/test/java/net/rcarz/jiraclient/IssueTest.java
+++ b/src/test/java/net/rcarz/jiraclient/IssueTest.java
@@ -10,8 +10,8 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONNull;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONNull;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
diff --git a/src/test/java/net/rcarz/jiraclient/IssueTypeTest.java b/src/test/java/net/rcarz/jiraclient/IssueTypeTest.java
index dd2c8204..17ce04f2 100644
--- a/src/test/java/net/rcarz/jiraclient/IssueTypeTest.java
+++ b/src/test/java/net/rcarz/jiraclient/IssueTypeTest.java
@@ -1,6 +1,6 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 import org.junit.Test;
 import org.powermock.api.mockito.PowerMockito;
 
diff --git a/src/test/java/net/rcarz/jiraclient/IssueWorklogTest.java b/src/test/java/net/rcarz/jiraclient/IssueWorklogTest.java
index f6fd2d52..124d3b7a 100644
--- a/src/test/java/net/rcarz/jiraclient/IssueWorklogTest.java
+++ b/src/test/java/net/rcarz/jiraclient/IssueWorklogTest.java
@@ -1,8 +1,8 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONObject;
-import net.sf.json.JSONSerializer;
+import org.kordamp.json.JSON;
+import org.kordamp.json.JSONObject;
+import org.kordamp.json.JSONSerializer;
 import org.joda.time.DateTime;
 import org.junit.Test;
 
diff --git a/src/test/java/net/rcarz/jiraclient/StatusTest.java b/src/test/java/net/rcarz/jiraclient/StatusTest.java
index cb1fed0e..b700d61f 100644
--- a/src/test/java/net/rcarz/jiraclient/StatusTest.java
+++ b/src/test/java/net/rcarz/jiraclient/StatusTest.java
@@ -1,6 +1,6 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 import org.junit.Test;
 import org.powermock.api.mockito.PowerMockito;
 
diff --git a/src/test/java/net/rcarz/jiraclient/TimeTrackingTest.java b/src/test/java/net/rcarz/jiraclient/TimeTrackingTest.java
index f0b68ec3..65ebd051 100644
--- a/src/test/java/net/rcarz/jiraclient/TimeTrackingTest.java
+++ b/src/test/java/net/rcarz/jiraclient/TimeTrackingTest.java
@@ -1,6 +1,6 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 import org.junit.Test;
 
 import java.sql.Time;
diff --git a/src/test/java/net/rcarz/jiraclient/TransitionTest.java b/src/test/java/net/rcarz/jiraclient/TransitionTest.java
index 4f28b1e1..c52b68d2 100644
--- a/src/test/java/net/rcarz/jiraclient/TransitionTest.java
+++ b/src/test/java/net/rcarz/jiraclient/TransitionTest.java
@@ -1,7 +1,7 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
-import net.sf.json.JSONSerializer;
+import org.kordamp.json.JSONObject;
+import org.kordamp.json.JSONSerializer;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.junit.Assert;
diff --git a/src/test/java/net/rcarz/jiraclient/UserTest.java b/src/test/java/net/rcarz/jiraclient/UserTest.java
index 442e2b3e..a0ee3360 100644
--- a/src/test/java/net/rcarz/jiraclient/UserTest.java
+++ b/src/test/java/net/rcarz/jiraclient/UserTest.java
@@ -1,6 +1,6 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 import org.junit.Test;
 import org.powermock.api.mockito.PowerMockito;
 
diff --git a/src/test/java/net/rcarz/jiraclient/Utils.java b/src/test/java/net/rcarz/jiraclient/Utils.java
index 1ac16f94..6a727623 100644
--- a/src/test/java/net/rcarz/jiraclient/Utils.java
+++ b/src/test/java/net/rcarz/jiraclient/Utils.java
@@ -1,7 +1,7 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
-import net.sf.json.JSONSerializer;
+import org.kordamp.json.JSONObject;
+import org.kordamp.json.JSONSerializer;
 
 public class Utils {
 
diff --git a/src/test/java/net/rcarz/jiraclient/VersionTest.java b/src/test/java/net/rcarz/jiraclient/VersionTest.java
index fcf575a7..f803b0c3 100644
--- a/src/test/java/net/rcarz/jiraclient/VersionTest.java
+++ b/src/test/java/net/rcarz/jiraclient/VersionTest.java
@@ -1,6 +1,6 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.mockito.PowerMockito;
diff --git a/src/test/java/net/rcarz/jiraclient/VotesTest.java b/src/test/java/net/rcarz/jiraclient/VotesTest.java
index 00ed16a1..26129774 100644
--- a/src/test/java/net/rcarz/jiraclient/VotesTest.java
+++ b/src/test/java/net/rcarz/jiraclient/VotesTest.java
@@ -1,6 +1,6 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.mockito.PowerMockito;
diff --git a/src/test/java/net/rcarz/jiraclient/WatchesTest.java b/src/test/java/net/rcarz/jiraclient/WatchesTest.java
index 20b15dc3..b04588f2 100644
--- a/src/test/java/net/rcarz/jiraclient/WatchesTest.java
+++ b/src/test/java/net/rcarz/jiraclient/WatchesTest.java
@@ -1,6 +1,6 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 import org.junit.Test;
 import org.powermock.api.mockito.PowerMockito;
 
diff --git a/src/test/java/net/rcarz/jiraclient/WorklogTest.java b/src/test/java/net/rcarz/jiraclient/WorklogTest.java
index 43b513ba..c1caecb8 100644
--- a/src/test/java/net/rcarz/jiraclient/WorklogTest.java
+++ b/src/test/java/net/rcarz/jiraclient/WorklogTest.java
@@ -1,6 +1,6 @@
 package net.rcarz.jiraclient;
 
-import net.sf.json.JSONObject;
+import org.kordamp.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.mockito.PowerMockito;