[gradle-1.12] 144/211: Merge remote-tracking branch 'origin/master'

[Kai-Chung Yan]

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 9f708a48b85cc8623a53cc28af0a23379de992c3
Merge: 564d79a 640410b
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Sat Jun 6 00:36:58 2015 +0800

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                                   | 10 +++++
 debian/patches/37_replace_internal_testng_api.diff | 21 ++++++++++
 debian/patches/38_use_jdk7_nio_file_api.diff       | 46 ++++++++++++++++++++++
 .../39_ignore_test_processor_assertion.diff        | 13 ++++++
 debian/patches/series                              |  3 ++
 5 files changed, 93 insertions(+)

diff --cc debian/changelog
index a086f16,e6b674d..90da583
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,13 +1,35 @@@
 +gradle (1.12-1) UNRELEASED; urgency=low
 +
 +  * New upstream release
 +  * Move jars between packages
 +    - gradle-cli.jar from gradle to libgradle-core-java
 +    - gradle-open-api.jar from gradle to libgradle-core-java
 +    - 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
 +  * 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
 +    - rhino_rename.diff: Correct the name of rhino library
 +    - servlet_api.diff: Use libservlet2.5-java
 +
 + -- Kai-Chung Yan <seamlikok at gmail.com>  Thu, 21 May 2015 16:02:50 +0800
 +
+ gradle (1.5-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Fixed a compatibility issue with testng 6.9
+   * Use the JDK 7 API for the chmod/stat operations until jnr-posix
+     is fixed in sid
+   * Removed a failing assertion in JUnitTestEventAdapter
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 05 Jun 2015 14:40:27 +0200
+ 
  gradle (1.5-2) unstable; urgency=medium
  
    * Team upload.
diff --cc debian/patches/series
index 99747b5,ec12cc1..83f2166
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,21 -1,21 +1,24 @@@
 -01_use_debian_jars.diff
 -02_sonar.diff
 +use_local_artifacts.diff
 +34_disable_code_quality.diff
 +disable_buildSrc_tests.diff
 +do_not_use_jdk5_guava.diff
 +fix_asm5_version.diff
 +fix_DocGenerationException.diff
  03_plexus.diff
 -11_fix_jni_path.diff
  13_fix_javadocs_links.diff
 -21_docs.diff
 -23_replace_jna-posix_with_jnr-posix.diff
 -24_pegdown.diff
 -26_disable_commitid.diff
 -27_maven.diff
 -28_findbugs.diff
 -30_envjs.diff
 -31_hamcrest_12.diff
 -32_disable_it.diff
 -33_scala_zinc.diff
 -34_disable_code_quality.diff
 -35_ivy_23.diff
  36_java8_compatibility.diff
+ 37_replace_internal_testng_api.diff
+ 38_use_jdk7_nio_file_api.diff
+ 39_ignore_test_processor_assertion.diff
 +fix_buildInit.diff
 +fix_launcher.diff
 +disable_docs.diff
 +33_scala_zinc.diff
 +disable_distributions.diff
 +disable_tests.diff
 +remove_test_dependencies.diff
 +fix_bintray_name.diff
 +build_comparison_css.diff
 +rhino_rename.diff
 +servlet_api.diff
 +do_not_use_bcpg_jdk5.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git