This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit 40396f233affe45d1730c61a30bfd650f44b4ca5 Author: Kai-Chung Yan <[email protected]> Date: Mon Jun 8 19:04:24 2015 +0800 Fix bintray --- debian/changelog | 7 +++- debian/control | 2 +- debian/patches/fix_bintray_api.diff | 43 ++++++++++++++++++++++ ...ray_name.diff => fix_bintray_dependencies.diff} | 13 ++++++- debian/patches/remove_test_dependencies.diff | 16 ++++---- debian/patches/series | 3 +- 6 files changed, 70 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index b2a7355..0711bfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,14 +7,17 @@ gradle (1.12+dfsg-1) UNRELEASED; urgency=low - gradle-messaging.jar from gradle to libgradle-core-java - gradle-native.jar from gradle to libgradle-core-java - gradle-wrapper.jar from libgradle-core-java to libgradle-plugins-java - * Remove all symlinks + * Remove all symlinks, placing all jars in /usr/share/java/ + * Abandon 23_replace_jna-posix_with_jnr-posix.diff: Future Gradle do not use + jnr any more * Abandon 90_respect_user_java_home.diff * Multiple new patches under debian/patches/ - disable_buildSrc_tests.diff: Disable buildSrc tests - do_not_use_bcpg_jdk5.diff: bouncycastle libraries in Debian do not ship with jdk5 versions - fix_asm5_version.diff: Fix ASM version mismatch - - fix_bintray_name.diff: Correct the name of bintray library + - fix_bintray_api.diff: Update the usage of bintray APIs 0.8.1 + - fix_bintray_dependencies.diff: Correct the name of bintray library - rhino_rename.diff: Correct the name of rhino library - servlet_api.diff: Use libservlet2.5-java diff --git a/debian/control b/debian/control index df2f6f8..ca3380e 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Build-Depends: ant (>= 1.8), libaether-java, libantlr-java, libasm4-java (>= 5), - libbintray-client-java, + libbintray-client-java (>= 0.8.1), libbcpg-java, libbcprov-java, libclassycle-java, diff --git a/debian/patches/fix_bintray_api.diff b/debian/patches/fix_bintray_api.diff new file mode 100644 index 0000000..280bdbf --- /dev/null +++ b/debian/patches/fix_bintray_api.diff @@ -0,0 +1,43 @@ +Description: Gradle 1.12 uses bintray-client-java 0.1.0 but the API usage + has been changed a lot in 0.8.1. This patch adapts the API + usage of bintray-client-java 0.8.1. +Author: Kai-Chung Yan <[email protected]> +Last-Update: 2015-06-08 +--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterPluginMapper.java ++++ b/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterPluginMapper.java +@@ -66,13 +66,19 @@ + } + + Bintray bintrayClient = createBintrayClient(); +- List<Pkg> results = bintrayClient. +- subject(GRADLE_PLUGINS_ORG). +- repository(GRADLE_PLUGINS_REPO). +- searchForPackage(). +- byAttributeName(PLUGIN_ID_ATTRIBUTE_NAME). +- equals(pluginId). +- search(); ++ List<Pkg> results; ++ try { ++ results = bintrayClient. ++ subject(GRADLE_PLUGINS_ORG). ++ repository(GRADLE_PLUGINS_REPO). ++ searchForPackage(). ++ byAttributeName(PLUGIN_ID_ATTRIBUTE_NAME). ++ equalsVal(pluginId). ++ searchPackage(); ++ } ++ catch (java.io.IOException e) { ++ results = new java.util.ArrayList<Pkg>(); ++ } + + String systemId; + +@@ -99,7 +105,7 @@ + private Bintray createBintrayClient() { + String override = System.getProperty(BINTRAY_API_OVERRIDE_URL_PROPERTY); + if (override == null) { +- return BintrayClient.create(); ++ return BintrayClient.create(BintrayClient.BINTRAY_API_URL, null, null); + } else { + return BintrayClient.create(override, null, null); + } diff --git a/debian/patches/fix_bintray_name.diff b/debian/patches/fix_bintray_dependencies.diff similarity index 57% rename from debian/patches/fix_bintray_name.diff rename to debian/patches/fix_bintray_dependencies.diff index da86b2f..a25bb66 100644 --- a/debian/patches/fix_bintray_name.diff +++ b/debian/patches/fix_bintray_dependencies.diff @@ -1,7 +1,8 @@ Description: In the latest bintray-client-java, bintray-client-java-impl has been renamed to bintray-client-java-service. + Gradle also uses APIs not only in bintray-client-java-services. Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-06-03 +Last-Update: 2015-06-08 --- a/subprojects/core/core.gradle +++ b/subprojects/core/core.gradle @@ -48,7 +48,7 @@ @@ -9,7 +10,15 @@ Last-Update: 2015-06-03 //runtime project(":docs") - compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-impl', version: '0.1.0') { -+ compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-service', version: '0.1.0') { ++ compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-service', version: '[0.8.1, )') { exclude module:'groovy-all' exclude module:'groovy' exclude group: 'org.slf4j' +@@ -57,6 +57,7 @@ + exclude module: 'httpclient' + exclude module: 'nekohtml' + } ++ compile "com.jfrog.bintray.client:bintray-client-java-api:[0.8.1, )" + compile libraries.commons_httpclient // Needed by bintray client + + runtime libraries.log4j_to_slf4j diff --git a/debian/patches/remove_test_dependencies.diff b/debian/patches/remove_test_dependencies.diff index 6bdea5e..1933253 100644 --- a/debian/patches/remove_test_dependencies.diff +++ b/debian/patches/remove_test_dependencies.diff @@ -29,20 +29,20 @@ Last-Update: 2015-05-28 /* --- a/subprojects/core/core.gradle +++ b/subprojects/core/core.gradle -@@ -69,10 +69,10 @@ +@@ -68,13 +68,6 @@ + testRuntime libraries.xerces testRuntime project(":diagnostics") - +- - testFixturesCompile project(":internalTesting") - testFixturesRuntime project(':coreImpl') -+ //testFixturesCompile project(":internalTesting") -+ //testFixturesRuntime project(':coreImpl') - +- - integTestCompile project(":internalIntegTesting") -+ //integTestCompile project(":internalIntegTesting") - - reports 'css3-pie:css3-pie:1.0beta3' +- +- reports 'css3-pie:css3-pie:1.0beta3' } + + useTestFixtures() --- a/subprojects/core-impl/core-impl.gradle +++ b/subprojects/core-impl/core-impl.gradle @@ -27,7 +27,7 @@ diff --git a/debian/patches/series b/debian/patches/series index 83f2166..a966d98 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,8 +17,9 @@ disable_docs.diff disable_distributions.diff disable_tests.diff remove_test_dependencies.diff -fix_bintray_name.diff +fix_bintray_dependencies.diff build_comparison_css.diff rhino_rename.diff servlet_api.diff do_not_use_bcpg_jdk5.diff +fix_bintray_api.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
