This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository bintray-client-java.
commit 871d4c8bd0c50e35edc3be28319ca325392387ea Author: Kai-Chung Yan <[email protected]> Date: Mon Jun 1 17:22:20 2015 +0800 use_jackson_2.diff: Switch to Jackson 2.x --- debian/control | 4 +- debian/patches/series | 1 + debian/patches/use_jackson_2.diff | 280 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 284 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 199c950..f5d03bc 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,9 @@ Build-Depends: debhelper (>= 9), libcommons-io-java (>= 2.1), libcommons-lang-java (>= 2.6), libhttpclient-java (>= 4.3.5), - libjackson-json-java, + libjackson2-annotations-java, + libjackson2-core-java, + libjackson2-databind-java, libjoda-time-java (>= 2.2), liblogback-java (>= 1.0.10), libslf4j-java (>= 1.7.5), diff --git a/debian/patches/series b/debian/patches/series index b548adf..207b539 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ use_local_artifacts.diff disable_publishing.diff disable_tests.diff +use_jackson_2.diff diff --git a/debian/patches/use_jackson_2.diff b/debian/patches/use_jackson_2.diff new file mode 100644 index 0000000..3ce5fec --- /dev/null +++ b/debian/patches/use_jackson_2.diff @@ -0,0 +1,280 @@ +Description: bintray-client-java uses Jackson 1.x but it is broken in Debian, + so we need to switch to Jackson 2.x. +Author: Kai-Chung Yan <[email protected]> +Last-Update: 2015-06-01 +--- a/build.gradle ++++ b/build.gradle +@@ -62,7 +62,10 @@ + compile 'ch.qos.logback:logback-classic:1.0.10' + compile 'joda-time:joda-time:2.2' + compile 'commons-io:commons-io:2.1' +- compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.5' ++ //compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.5' ++ compile "com.fasterxml.jackson.core:jackson-annotations" ++ compile "com.fasterxml.jackson.core:jackson-core" ++ compile "com.fasterxml.jackson.core:jackson-databind" + compile("org.apache.httpcomponents:httpclient:4.3.5") { + exclude group: 'commons-logging' //DO NOT REMOVE + } +--- a/api/src/main/java/com/jfrog/bintray/client/api/details/Attribute.java ++++ b/api/src/main/java/com/jfrog/bintray/client/api/details/Attribute.java +@@ -1,9 +1,12 @@ + package com.jfrog.bintray.client.api.details; + + +-import org.codehaus.jackson.annotate.*; +-import org.codehaus.jackson.map.ObjectMapper; +-import org.codehaus.jackson.type.TypeReference; ++//import org.codehaus.jackson.annotate.*; ++import com.fasterxml.jackson.annotation.*; ++//import org.codehaus.jackson.map.ObjectMapper; ++import com.fasterxml.jackson.databind.ObjectMapper; ++//import org.codehaus.jackson.type.TypeReference; ++import com.fasterxml.jackson.core.type.TypeReference; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + +--- a/api/src/main/java/com/jfrog/bintray/client/api/details/ObjectMapperHelper.java ++++ b/api/src/main/java/com/jfrog/bintray/client/api/details/ObjectMapperHelper.java +@@ -1,10 +1,16 @@ + package com.jfrog.bintray.client.api.details; + ++/* + import org.codehaus.jackson.JsonFactory; + import org.codehaus.jackson.map.DeserializationConfig; + import org.codehaus.jackson.map.ObjectMapper; + import org.codehaus.jackson.map.SerializationConfig; + import org.codehaus.jackson.map.annotate.JsonSerialize; ++*/ ++ ++import com.fasterxml.jackson.annotation.*; ++import com.fasterxml.jackson.core.*; ++import com.fasterxml.jackson.databind.*; + + /** + * Helper class that provides the ObjectMapper for all Details classes +@@ -19,13 +25,18 @@ + ObjectMapper mapper = new ObjectMapper(new JsonFactory()); + + // TODO: when moving to Jackson 2.x these can be replaced with JodaModule +- mapper.configure(SerializationConfig.Feature.WRITE_DATES_AS_TIMESTAMPS, false); +- mapper.configure(SerializationConfig.Feature.WRITE_DATE_KEYS_AS_TIMESTAMPS, false); ++ //mapper.configure(SerializationConfig.Feature.WRITE_DATES_AS_TIMESTAMPS, false); ++ mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); ++ //mapper.configure(SerializationConfig.Feature.WRITE_DATE_KEYS_AS_TIMESTAMPS, false); ++ mapper.configure(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS, false); + + //Don't include keys with null values implicitly, only explicitly set values should be sent over +- mapper.configure(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY, false); +- mapper.configure(SerializationConfig.Feature.WRITE_NULL_MAP_VALUES, false); +- mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); ++ //mapper.configure(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY, false); ++ mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, false); ++ //mapper.configure(SerializationConfig.Feature.WRITE_NULL_MAP_VALUES, false); ++ mapper.configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false); ++ //mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); ++ mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + return mapper; + } + } +--- a/api/src/main/java/com/jfrog/bintray/client/api/details/PackageDetails.java ++++ b/api/src/main/java/com/jfrog/bintray/client/api/details/PackageDetails.java +@@ -1,10 +1,15 @@ + package com.jfrog.bintray.client.api.details; + ++/* + import org.codehaus.jackson.annotate.JsonCreator; + import org.codehaus.jackson.annotate.JsonIgnore; + import org.codehaus.jackson.annotate.JsonIgnoreProperties; + import org.codehaus.jackson.annotate.JsonProperty; + import org.codehaus.jackson.map.ObjectMapper; ++*/ ++ ++import com.fasterxml.jackson.annotation.*; ++import com.fasterxml.jackson.databind.ObjectMapper; + import org.joda.time.DateTime; + + import java.util.List; +--- a/api/src/main/java/com/jfrog/bintray/client/api/details/RepositoryDetails.java ++++ b/api/src/main/java/com/jfrog/bintray/client/api/details/RepositoryDetails.java +@@ -1,8 +1,13 @@ + package com.jfrog.bintray.client.api.details; + ++/* + import org.codehaus.jackson.annotate.JsonIgnoreProperties; + import org.codehaus.jackson.annotate.JsonProperty; + import org.codehaus.jackson.map.ObjectMapper; ++*/ ++ ++import com.fasterxml.jackson.annotation.*; ++import com.fasterxml.jackson.databind.ObjectMapper; + import org.joda.time.DateTime; + + import java.util.List; +--- a/api/src/main/java/com/jfrog/bintray/client/api/details/SubjectDetails.java ++++ b/api/src/main/java/com/jfrog/bintray/client/api/details/SubjectDetails.java +@@ -1,8 +1,13 @@ + package com.jfrog.bintray.client.api.details; + ++/* + import org.codehaus.jackson.annotate.JsonIgnoreProperties; + import org.codehaus.jackson.annotate.JsonProperty; + import org.codehaus.jackson.map.ObjectMapper; ++*/ ++ ++import com.fasterxml.jackson.annotation.*; ++import com.fasterxml.jackson.databind.ObjectMapper; + import org.joda.time.DateTime; + + import java.util.List; +--- a/api/src/main/java/com/jfrog/bintray/client/api/details/VersionDetails.java ++++ b/api/src/main/java/com/jfrog/bintray/client/api/details/VersionDetails.java +@@ -1,9 +1,14 @@ + package com.jfrog.bintray.client.api.details; + ++/* + import org.codehaus.jackson.annotate.JsonIgnore; + import org.codehaus.jackson.annotate.JsonIgnoreProperties; + import org.codehaus.jackson.annotate.JsonProperty; + import org.codehaus.jackson.map.ObjectMapper; ++*/ ++ ++import com.fasterxml.jackson.annotation.*; ++import com.fasterxml.jackson.databind.ObjectMapper; + import org.joda.time.DateTime; + + import java.util.List; +--- a/api/src/main/java/com/jfrog/bintray/client/api/BintrayCallException.java ++++ b/api/src/main/java/com/jfrog/bintray/client/api/BintrayCallException.java +@@ -5,8 +5,10 @@ + import org.apache.http.HttpResponse; + import org.apache.http.HttpStatus; + import org.apache.http.client.HttpResponseException; +-import org.codehaus.jackson.JsonNode; +-import org.codehaus.jackson.map.ObjectMapper; ++//import org.codehaus.jackson.JsonNode; ++import com.fasterxml.jackson.databind.JsonNode; ++//import org.codehaus.jackson.map.ObjectMapper; ++import com.fasterxml.jackson.databind.ObjectMapper; + + import java.io.IOException; + +@@ -38,7 +40,7 @@ + entity = IOUtils.toString(response.getEntity().getContent()); + ObjectMapper mapper = ObjectMapperHelper.objectMapper; + JsonNode node = mapper.readTree(entity); +- message = node.get("message").getTextValue(); ++ message = node.get("message").textValue(); + } catch (IOException | NullPointerException e) { + //Null entity? + if (entity != null) { +--- a/impl/src/main/java/com/jfrog/bintray/client/impl/handle/AttributesSearchQueryClauseImpl.java ++++ b/impl/src/main/java/com/jfrog/bintray/client/impl/handle/AttributesSearchQueryClauseImpl.java +@@ -5,7 +5,8 @@ + import com.jfrog.bintray.client.api.handle.AttributesSearchQueryClause; + import com.jfrog.bintray.client.api.model.Pkg; + import com.jfrog.bintray.client.api.model.Version; +-import org.codehaus.jackson.annotate.JsonIgnore; ++//import org.codehaus.jackson.annotate.JsonIgnore; ++import com.fasterxml.jackson.annotation.JsonIgnore; + import org.joda.time.DateTime; + + import java.io.IOException; +--- a/impl/src/main/java/com/jfrog/bintray/client/impl/handle/AttributesSearchQueryImpl.java ++++ b/impl/src/main/java/com/jfrog/bintray/client/impl/handle/AttributesSearchQueryImpl.java +@@ -6,11 +6,17 @@ + import com.jfrog.bintray.client.api.handle.AttributesSearchQueryClause; + import com.jfrog.bintray.client.api.model.Pkg; + import com.jfrog.bintray.client.api.model.Version; ++/* + import org.codehaus.jackson.JsonGenerator; + import org.codehaus.jackson.JsonProcessingException; + import org.codehaus.jackson.map.JsonSerializer; + import org.codehaus.jackson.map.SerializerProvider; + import org.codehaus.jackson.map.annotate.JsonSerialize; ++*/ ++ ++import com.fasterxml.jackson.core.*; ++import com.fasterxml.jackson.databind.*; ++import com.fasterxml.jackson.databind.annotation.*; + + import java.io.IOException; + import java.util.ArrayList; +--- a/impl/src/main/java/com/jfrog/bintray/client/impl/handle/PackageHandleImpl.java ++++ b/impl/src/main/java/com/jfrog/bintray/client/impl/handle/PackageHandleImpl.java +@@ -16,8 +16,10 @@ + import org.apache.http.HttpHeaders; + import org.apache.http.HttpResponse; + import org.apache.http.entity.ContentType; +-import org.codehaus.jackson.map.ObjectMapper; +-import org.codehaus.jackson.type.TypeReference; ++//import org.codehaus.jackson.map.ObjectMapper; ++import com.fasterxml.jackson.databind.ObjectMapper; ++//import org.codehaus.jackson.type.TypeReference; ++import com.fasterxml.jackson.core.type.TypeReference; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + +--- a/impl/src/main/java/com/jfrog/bintray/client/impl/handle/RepositoryHandleImpl.java ++++ b/impl/src/main/java/com/jfrog/bintray/client/impl/handle/RepositoryHandleImpl.java +@@ -16,8 +16,10 @@ + import org.apache.http.HttpHeaders; + import org.apache.http.HttpResponse; + import org.apache.http.entity.ContentType; +-import org.codehaus.jackson.map.ObjectMapper; +-import org.codehaus.jackson.type.TypeReference; ++//import org.codehaus.jackson.map.ObjectMapper; ++import com.fasterxml.jackson.databind.ObjectMapper; ++//import org.codehaus.jackson.type.TypeReference; ++import com.fasterxml.jackson.core.type.TypeReference; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + +--- a/impl/src/main/java/com/jfrog/bintray/client/impl/handle/SubjectHandleImpl.java ++++ b/impl/src/main/java/com/jfrog/bintray/client/impl/handle/SubjectHandleImpl.java +@@ -8,7 +8,8 @@ + import com.jfrog.bintray.client.api.model.Subject; + import com.jfrog.bintray.client.impl.model.SubjectImpl; + import org.apache.http.HttpResponse; +-import org.codehaus.jackson.map.ObjectMapper; ++//import org.codehaus.jackson.map.ObjectMapper; ++import com.fasterxml.jackson.databind.ObjectMapper; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + +--- a/impl/src/main/java/com/jfrog/bintray/client/impl/handle/VersionHandleImpl.java ++++ b/impl/src/main/java/com/jfrog/bintray/client/impl/handle/VersionHandleImpl.java +@@ -11,7 +11,8 @@ + import com.jfrog.bintray.client.impl.model.VersionImpl; + import org.apache.commons.io.IOUtils; + import org.apache.http.HttpResponse; +-import org.codehaus.jackson.map.ObjectMapper; ++//import org.codehaus.jackson.map.ObjectMapper; ++import com.fasterxml.jackson.databind.ObjectMapper; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + +--- a/impl/src/main/java/com/jfrog/bintray/client/impl/model/PackageImpl.java ++++ b/impl/src/main/java/com/jfrog/bintray/client/impl/model/PackageImpl.java +@@ -3,7 +3,8 @@ + import com.jfrog.bintray.client.api.details.ObjectMapperHelper; + import com.jfrog.bintray.client.api.details.PackageDetails; + import com.jfrog.bintray.client.api.model.Pkg; +-import org.codehaus.jackson.map.ObjectMapper; ++//import org.codehaus.jackson.map.ObjectMapper; ++import com.fasterxml.jackson.databind.ObjectMapper; + import org.joda.time.DateTime; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; +--- a/impl/src/main/java/com/jfrog/bintray/client/impl/model/VersionImpl.java ++++ b/impl/src/main/java/com/jfrog/bintray/client/impl/model/VersionImpl.java +@@ -3,7 +3,8 @@ + import com.jfrog.bintray.client.api.details.ObjectMapperHelper; + import com.jfrog.bintray.client.api.details.VersionDetails; + import com.jfrog.bintray.client.api.model.Version; +-import org.codehaus.jackson.map.ObjectMapper; ++//import org.codehaus.jackson.map.ObjectMapper; ++import com.fasterxml.jackson.databind.ObjectMapper; + import org.joda.time.DateTime; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bintray-client-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
