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

Jump to bottom

Replace old net.sf.json json-lib by fork/continuation #292

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace old net.sf.json json-lib by fork/continuation #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,18 @@
</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>
<version>7</version>
</parent>

<dependencies>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand All @@ -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>
Expand Down Expand Up @@ -91,6 +94,5 @@
<version>2.4.6</version>
<scope>test</scope>
</dependency>

</dependencies>
</project>
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/Attachment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rcarz/jiraclient/ChangeLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rcarz/jiraclient/ChangeLogEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rcarz/jiraclient/ChangeLogItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import java.util.Map;

import net.sf.json.JSONObject;
import org.kordamp.json.JSONObject;

/**
* Item in a {@link ChangeLogEntry}.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/Comment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/Component.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/CustomFieldOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/rcarz/jiraclient/Field.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/Filter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/rcarz/jiraclient/Issue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/IssueHistory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rcarz/jiraclient/IssueHistoryItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.Map;

import net.sf.json.JSONObject;
import org.kordamp.json.JSONObject;

public class IssueHistoryItem extends Resource {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/IssueLink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/IssueType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/rcarz/jiraclient/JiraClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/LinkType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/Priority.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/rcarz/jiraclient/Project.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/ProjectCategory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rcarz/jiraclient/RemoteLink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/Resolution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/rcarz/jiraclient/RestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/Security.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/Status.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rcarz/jiraclient/TimeTracking.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import java.util.Map;

import net.sf.json.JSONObject;
import org.kordamp.json.JSONObject;

/**
* Represents issue time tracking data.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/TokenCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rcarz/jiraclient/Transition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package net.rcarz.jiraclient;

import net.sf.json.JSONObject;
import org.kordamp.json.JSONObject;
import java.util.Map;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rcarz/jiraclient/Visibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.rcarz.jiraclient;

import net.sf.json.JSONObject;
import org.kordamp.json.JSONObject;

import java.util.Map;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/Votes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/Watches.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/rcarz/jiraclient/WorkLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading