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 eaf0c68bacb642b1409a2ff818c02b8595aae1d9 Author: Kai-Chung Yan <[email protected]> Date: Mon Jun 8 03:22:11 2015 +0800 Refresh patches --- debian/patches/37_replace_internal_testng_api.diff | 8 ++-- debian/patches/38_use_jdk7_nio_file_api.diff | 46 ++++++++-------------- 2 files changed, 20 insertions(+), 34 deletions(-) diff --git a/debian/patches/37_replace_internal_testng_api.diff b/debian/patches/37_replace_internal_testng_api.diff index 97f6e46..15734ca 100644 --- a/debian/patches/37_replace_internal_testng_api.diff +++ b/debian/patches/37_replace_internal_testng_api.diff @@ -5,17 +5,17 @@ Bug: https://github.com/gradle/gradle/pull/470 +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/ProjectDependencyArtifactIdExtractorHack.java @@ -17,6 +17,7 @@ package org.gradle.api.publication.maven.internal.ant; - + import com.google.common.collect.Lists; +import com.google.common.collect.Sets; + import org.apache.maven.project.MavenProject; import org.gradle.api.Nullable; import org.gradle.api.Project; - import org.gradle.api.artifacts.ProjectDependency; -@@ -25,7 +26,6 @@ +@@ -26,7 +27,6 @@ import org.gradle.api.artifacts.repositories.ArtifactRepository; import org.gradle.api.plugins.BasePluginConvention; import org.gradle.api.tasks.Upload; -import org.testng.internal.annotations.Sets; - + import java.util.Collection; import java.util.Set; diff --git a/debian/patches/38_use_jdk7_nio_file_api.diff b/debian/patches/38_use_jdk7_nio_file_api.diff index 5b3e6a4..f6ddd7a 100644 --- a/debian/patches/38_use_jdk7_nio_file_api.diff +++ b/debian/patches/38_use_jdk7_nio_file_api.diff @@ -1,46 +1,32 @@ -Description: Use the JDK 7 API for the chmod/stat operations until jnr-posix is fixed in sid +Description: Use the JDK 7 API for the chmod/stat operations until jnr-posix +is fixed in sid Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed +Last-Update: 2015-06-08 --- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java +++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java -@@ -56,15 +56,17 @@ - serviceRegistry.add(Symlink.class, createSymlink(libC)); - - // Use libc backed implementations on Linux and Mac, if libc available -+/* - if (libC != null && (operatingSystem.isLinux() || operatingSystem.isMacOsX())) { - FilePathEncoder filePathEncoder = createEncoder(libC); - serviceRegistry.add(Chmod.class, new LibcChmod(libC, filePathEncoder)); - serviceRegistry.add(Stat.class, new LibCStat(libC, operatingSystem, PosixUtil.current(), filePathEncoder)); - return; - } -+*/ +@@ -52,22 +52,14 @@ + LibC libC = loadLibC(); + Symlink symlink = symlink(libC); +- // Use libc backed implementations on Linux, if libc available +- POSIX posix = PosixUtil.current(); +- if ((libC != null && (operatingSystem.isLinux())) && posix instanceof BaseNativePOSIX) { +- FilePathEncoder filePathEncoder = new DefaultFilePathEncoder(libC); +- Chmod chmod = new LibcChmod(libC, filePathEncoder); +- Stat stat = new LibCStat(libC, operatingSystem, (BaseNativePOSIX) posix, filePathEncoder); +- return new GenericFileSystem(chmod, stat, symlink); +- } +- // Use java 7 APIs, if available - if (JavaVersion.current().isJava7()) { + if (true) { String jdkFilePermissionclass = "org.gradle.internal.nativeplatform.filesystem.jdk7.PosixJdk7FilePermissionHandler"; try { Object handler = FileSystemServices.class.getClassLoader().loadClass(jdkFilePermissionclass).newInstance(); -@@ -72,6 +74,7 @@ - serviceRegistry.add(Chmod.class, (Chmod) handler); - return; + return new GenericFileSystem((Chmod) handler, (Stat) handler, symlink); } catch (ClassNotFoundException e) { +e.printStackTrace(); LOGGER.warn(String.format("Unable to load %s. Continuing with fallback.", jdkFilePermissionclass)); } catch (Exception e) { throw UncheckedException.throwAsUncheckedException(e); ---- a/subprojects/native/native.gradle -+++ b/subprojects/native/native.gradle -@@ -22,11 +22,6 @@ - compile libraries.jcip - } - --if (!javaVersion.java7) { -- sourceSets.main.java.exclude '**/jdk7/**' -- sourceSets.test.groovy.exclude '**/jdk7/**' --} -- - useTestFixtures() - useClassycle() - -- 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
