This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bintray-client-java.
commit daffe9f6135379849e411bd1526255f8058fd5e5 Author: Emmanuel Bourg <[email protected]> Date: Thu Jun 4 14:18:54 2015 +0200 Use the debian version of httpclient --- debian/patches/01_use_local_artifacts.patch | 9 +++++++++ debian/patches/04_use_jackson2.patch | 5 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/patches/01_use_local_artifacts.patch b/debian/patches/01_use_local_artifacts.patch index 0101847..786ac37 100644 --- a/debian/patches/01_use_local_artifacts.patch +++ b/debian/patches/01_use_local_artifacts.patch @@ -30,3 +30,12 @@ Last-Update: 2015-06-01 artifactory { contextUrl = 'https://oss.jfrog.org' resolve { +@@ -54,7 +61,7 @@ + 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.apache.httpcomponents:httpclient:4.3.5") { ++ compile("org.apache.httpcomponents:httpclient:debian") { + exclude group: 'commons-logging' //DO NOT REMOVE + } + } diff --git a/debian/patches/04_use_jackson2.patch b/debian/patches/04_use_jackson2.patch index 3ce5fec..f07d302 100644 --- a/debian/patches/04_use_jackson2.patch +++ b/debian/patches/04_use_jackson2.patch @@ -4,16 +4,15 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-06-01 --- a/build.gradle +++ b/build.gradle -@@ -62,7 +62,10 @@ +@@ -62,7 +62,9 @@ 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") { + compile("org.apache.httpcomponents:httpclient:debian") { exclude group: 'commons-logging' //DO NOT REMOVE } --- a/api/src/main/java/com/jfrog/bintray/client/api/details/Attribute.java -- 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
