Commit a73a494e authored by Tim Olshansky's avatar Tim Olshansky

Merge pull request #55 from babltiga/dependency-updates

Dependency Upgrades
parents e0c4f02d a886ed0d
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.gitlab</groupId> <groupId>org.gitlab</groupId>
...@@ -66,19 +67,19 @@ ...@@ -66,19 +67,19 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-core</artifactId>
<version>1.9.13</version> <version>2.5.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-databind</artifactId>
<version>1.9.13</version> <version>2.5.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>1.4</version> <version>2.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.11</version> <version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
package org.gitlab.api; package org.gitlab.api;
import org.codehaus.jackson.map.DeserializationConfig;
import org.codehaus.jackson.map.ObjectMapper;
import org.gitlab.api.http.GitlabHTTPRequestor;
import org.gitlab.api.http.Query;
import org.gitlab.api.models.*;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URL; import java.net.URL;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.gitlab.api.http.GitlabHTTPRequestor;
import org.gitlab.api.http.Query;
import org.gitlab.api.models.GitlabAccessLevel;
import org.gitlab.api.models.GitlabBranch;
import org.gitlab.api.models.GitlabCommit;
import org.gitlab.api.models.GitlabCommitDiff;
import org.gitlab.api.models.GitlabGroup;
import org.gitlab.api.models.GitlabGroupMember;
import org.gitlab.api.models.GitlabIssue;
import org.gitlab.api.models.GitlabMergeRequest;
import org.gitlab.api.models.GitlabMilestone;
import org.gitlab.api.models.GitlabNamespace;
import org.gitlab.api.models.GitlabNote;
import org.gitlab.api.models.GitlabProject;
import org.gitlab.api.models.GitlabProjectHook;
import org.gitlab.api.models.GitlabProjectMember;
import org.gitlab.api.models.GitlabSSHKey;
import org.gitlab.api.models.GitlabSession;
import org.gitlab.api.models.GitlabUser;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
/** /**
* Gitlab API Wrapper class * Gitlab API Wrapper class
...@@ -23,7 +39,7 @@ import java.util.List; ...@@ -23,7 +39,7 @@ import java.util.List;
*/ */
public class GitlabAPI { public class GitlabAPI {
public static final ObjectMapper MAPPER = new ObjectMapper().configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); public static final ObjectMapper MAPPER = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
private static final String API_NAMESPACE = "/api/v3"; private static final String API_NAMESPACE = "/api/v3";
private static final String PARAM_SUDO = "sudo"; private static final String PARAM_SUDO = "sudo";
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public abstract class GitlabAbstractMember extends GitlabUser { public abstract class GitlabAbstractMember extends GitlabUser {
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
public enum GitlabAccessLevel { public enum GitlabAccessLevel {
Guest(10), Guest(10),
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabBranch { public class GitlabBranch {
public final static String URL = "/repository/branches/"; public final static String URL = "/repository/branches/";
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabBranchCommit { public class GitlabBranchCommit {
public static String URL = "/users"; public static String URL = "/users";
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabCommit { public class GitlabCommit {
public final static String URL = "/commits"; public final static String URL = "/commits";
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabCommitDiff { public class GitlabCommitDiff {
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabGroup { public class GitlabGroup {
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabIssue { public class GitlabIssue {
public enum Action { public enum Action {
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabMergeRequest { public class GitlabMergeRequest {
public static final String URL = "/merge_requests"; public static final String URL = "/merge_requests";
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabMilestone { public class GitlabMilestone {
public static final String URL = "/milestones"; public static final String URL = "/milestones";
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabNamespace { public class GitlabNamespace {
public static final String URL = "/groups"; public static final String URL = "/groups";
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabNote { public class GitlabNote {
public static final String URL = "/notes"; public static final String URL = "/notes";
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabPermission { public class GitlabPermission {
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabProject { public class GitlabProject {
public static final String URL = "/projects"; public static final String URL = "/projects";
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabProjectAccessLevel { public class GitlabProjectAccessLevel {
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabProjectHook { public class GitlabProjectHook {
public final static String URL = "/hooks"; public final static String URL = "/hooks";
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date;
public class GitlabSSHKey { public class GitlabSSHKey {
public static String KEYS_URL = "/keys"; public static String KEYS_URL = "/keys";
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabSession extends GitlabUser { public class GitlabSession extends GitlabUser {
......
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabUser { public class GitlabUser {
public static String URL = "/users"; public static String URL = "/users";
public static String USERS_URL = "/users"; public static String USERS_URL = "/users";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment