From bc2aae6a7bcfa9d0257a8426150fa232f9b861d2 Mon Sep 17 00:00:00 2001 From: ysong Date: Thu, 20 Feb 2014 19:03:46 +0800 Subject: [PATCH 1/3] jackson v2 --- README.md | 4 ++- pom.xml | 29 +++++++++++-------- src/main/java/org/gitlab/api/GitlabAPI.java | 13 +++------ .../gitlab/api/http/GitlabHTTPRequestor.java | 2 ++ .../org/gitlab/api/models/GitlabBranch.java | 2 +- .../org/gitlab/api/models/GitlabCommit.java | 3 +- .../gitlab/api/models/GitlabMergeRequest.java | 2 +- .../gitlab/api/models/GitlabNamespace.java | 3 +- .../org/gitlab/api/models/GitlabNote.java | 3 +- .../org/gitlab/api/models/GitlabProject.java | 3 +- .../gitlab/api/models/GitlabProjectHook.java | 3 +- .../org/gitlab/api/models/GitlabUser.java | 3 +- 12 files changed, 40 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index e5e7fc4f..07cf31bb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # Gitlab Java API Wrapper -A wrapper for the [Gitlab API](https://gitlab.org) written in Java. \ No newline at end of file +A wrapper for the [Gitlab API](https://gitlab.org) written in Java. + +fork it to upgraded Jackson to version 2 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8cb26275..8ff62700 100644 --- a/pom.xml +++ b/pom.xml @@ -3,8 +3,8 @@ 4.0.0 org.gitlab - java-gitlab-api - 1.1.3-SNAPSHOT + java-gitlab-api-jacksonv2 + 1.1.3.1-SNAPSHOT Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API @@ -32,14 +32,14 @@ - scm:git:ssh://github.com/timols/java-gitlab-api.git - scm:git:ssh://git@github.com/timols/java-gitlab-api.git - https://github.com/timols/java-gitlab-api + scm:git:ssh://github.com/godemo/java-gitlab-api.git + scm:git:ssh://git@github.com/godemo/java-gitlab-api.git + https://github.com/godemo/java-gitlab-api Github - https://github.com/timols/java-gitlab-api/issues + https://github.com/godemo/java-gitlab-api/issues @@ -48,14 +48,19 @@ - org.codehaus.jackson - jackson-core-asl - 1.9.9 + com.fasterxml.jackson.core + jackson-core + 2.2.2 - org.codehaus.jackson - jackson-mapper-asl - 1.9.9 + com.fasterxml.jackson.core + jackson-databind + 2.2.2 + + + com.fasterxml.jackson.core + jackson-annotations + 2.2.2 commons-io diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index f967378b..02d2f6a1 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1,14 +1,9 @@ package org.gitlab.api; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; import org.gitlab.api.http.GitlabHTTPRequestor; -import org.gitlab.api.models.GitlabBranch; -import org.gitlab.api.models.GitlabCommit; -import org.gitlab.api.models.GitlabMergeRequest; -import org.gitlab.api.models.GitlabNote; -import org.gitlab.api.models.GitlabProject; -import org.gitlab.api.models.GitlabProjectHook; +import org.gitlab.api.models.*; import java.io.IOException; import java.net.URL; @@ -28,7 +23,7 @@ public class GitlabAPI { private final String _apiToken; private boolean _ignoreCertificateErrors = false; private static final String API_NAMESPACE = "/api/v3"; - 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 GitlabAPI(String hostUrl, String apiToken) { _hostUrl = hostUrl.endsWith("/") ? hostUrl.replaceAll("/$", "") : hostUrl; diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index e06ba4de..9a7d7df6 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -21,6 +21,8 @@ import org.apache.commons.io.IOUtils; import org.gitlab.api.GitlabAPI; + + /** * Gitlab HTTP Requestor * diff --git a/src/main/java/org/gitlab/api/models/GitlabBranch.java b/src/main/java/org/gitlab/api/models/GitlabBranch.java index 0fd6d878..790f978f 100644 --- a/src/main/java/org/gitlab/api/models/GitlabBranch.java +++ b/src/main/java/org/gitlab/api/models/GitlabBranch.java @@ -1,6 +1,6 @@ package org.gitlab.api.models; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class GitlabBranch { public final static String URL = "/repository/branches/"; diff --git a/src/main/java/org/gitlab/api/models/GitlabCommit.java b/src/main/java/org/gitlab/api/models/GitlabCommit.java index 6db13cc9..521d1a0a 100644 --- a/src/main/java/org/gitlab/api/models/GitlabCommit.java +++ b/src/main/java/org/gitlab/api/models/GitlabCommit.java @@ -1,7 +1,8 @@ package org.gitlab.api.models; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.Date; -import org.codehaus.jackson.annotate.JsonProperty; public class GitlabCommit { diff --git a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java index 2b74b828..1bf9f49f 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java +++ b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java @@ -1,6 +1,6 @@ package org.gitlab.api.models; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class GitlabMergeRequest { public static final String URL = "/merge_requests"; diff --git a/src/main/java/org/gitlab/api/models/GitlabNamespace.java b/src/main/java/org/gitlab/api/models/GitlabNamespace.java index 6f40a1d9..5f9531a4 100644 --- a/src/main/java/org/gitlab/api/models/GitlabNamespace.java +++ b/src/main/java/org/gitlab/api/models/GitlabNamespace.java @@ -1,7 +1,8 @@ package org.gitlab.api.models; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.Date; -import org.codehaus.jackson.annotate.JsonProperty; public class GitlabNamespace { diff --git a/src/main/java/org/gitlab/api/models/GitlabNote.java b/src/main/java/org/gitlab/api/models/GitlabNote.java index 52778444..70828a4a 100644 --- a/src/main/java/org/gitlab/api/models/GitlabNote.java +++ b/src/main/java/org/gitlab/api/models/GitlabNote.java @@ -1,7 +1,8 @@ package org.gitlab.api.models; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.Date; -import org.codehaus.jackson.annotate.JsonProperty; public class GitlabNote { diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index da56dd03..14ebb458 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -1,7 +1,8 @@ package org.gitlab.api.models; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.Date; -import org.codehaus.jackson.annotate.JsonProperty; public class GitlabProject { diff --git a/src/main/java/org/gitlab/api/models/GitlabProjectHook.java b/src/main/java/org/gitlab/api/models/GitlabProjectHook.java index 7c1889a8..344efa45 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProjectHook.java +++ b/src/main/java/org/gitlab/api/models/GitlabProjectHook.java @@ -1,8 +1,9 @@ package org.gitlab.api.models; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.Date; -import org.codehaus.jackson.annotate.JsonProperty; public class GitlabProjectHook { diff --git a/src/main/java/org/gitlab/api/models/GitlabUser.java b/src/main/java/org/gitlab/api/models/GitlabUser.java index 352f5578..56e77f12 100644 --- a/src/main/java/org/gitlab/api/models/GitlabUser.java +++ b/src/main/java/org/gitlab/api/models/GitlabUser.java @@ -1,7 +1,8 @@ package org.gitlab.api.models; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.Date; -import org.codehaus.jackson.annotate.JsonProperty; public class GitlabUser { public static String URL = "/users"; From 32d0f6e54d477b30054018b637e477a1ff1ae741 Mon Sep 17 00:00:00 2001 From: godemo <360810110@qq.com> Date: Thu, 20 Feb 2014 19:05:45 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07cf31bb..3a5be835 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ A wrapper for the [Gitlab API](https://gitlab.org) written in Java. -fork it to upgraded Jackson to version 2 \ No newline at end of file +fork for Jackson to version 2 From 9af0ba218f98f8a4bf3bd1642cf4463c48c1151a Mon Sep 17 00:00:00 2001 From: godemo <360810110@qq.com> Date: Thu, 20 Feb 2014 19:06:02 +0800 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a5be835..4e64accc 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ A wrapper for the [Gitlab API](https://gitlab.org) written in Java. -fork for Jackson to version 2 +fork for Jackson version 2