This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libspring-java.
commit c29e9228c81216ff35683bb28ad1f36d715b7b31 Author: Emmanuel Bourg <[email protected]> Date: Tue May 31 14:36:21 2016 +0200 Disabled the OkHttp support in spring-web --- debian/changelog | 1 + debian/maven.ignoreRules | 1 + debian/patches/0043-ignore-okhttp.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 23 insertions(+) diff --git a/debian/changelog b/debian/changelog index b28f082..595a22d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libspring-java (4.2.6-1) UNRELEASED; urgency=medium - Refreshed the patches - Disabled the Money API support for spring-context (not in Debian) - Disabled the Hibernate 5 support in spring-orm (not in Debian) + - Disabled the OkHttp support in spring-web (not in Debian) - New dependency on webjars-locator for spring-webmvc - New dependency on commons-pool2 for spring-aop diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 7832e5c..22f9ad9 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -3,6 +3,7 @@ com.h2database h2 * * * * org.hibernate hibernate-annotations * * * * io.spring.gradle docbook-reference-plugin * * * * javax.money money-api * * * * +com.squareup.okhttp okhttp * * * * org.asciidoctor asciidoctor-gradle-plugin * * * * org.mvel mvel2 * * * * org.skyscreamer jsonassert * * * * diff --git a/debian/patches/0043-ignore-okhttp.patch b/debian/patches/0043-ignore-okhttp.patch new file mode 100644 index 0000000..27032f4 --- /dev/null +++ b/debian/patches/0043-ignore-okhttp.patch @@ -0,0 +1,20 @@ +Description: Disable the OkHttp support (not in Debian) +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.gradle ++++ b/build.gradle +@@ -741,6 +741,14 @@ + testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2Version}") + testRuntime("com.sun.mail:javax.mail:${javamailVersion}") + } ++ ++ sourceSets { ++ main { ++ java { ++ exclude "**/OkHttp*" ++ } ++ } ++ } + } + + project("spring-orm") { diff --git a/debian/patches/series b/debian/patches/series index 8477a18..434eaae 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ 0040-ignore-json-assert.patch 0041-servlet-api-compatibility.patch 0042-ignore-money-api.patch +0043-ignore-okhttp.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
