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 84fe6bb5e58e1cf7072f674c20e4b8d58a518e52 Author: Kai-Chung Yan <[email protected]> Date: Mon Jun 8 21:26:38 2015 +0800 Fix Ivy --- debian/patches/35_ivy_23.diff | 79 +++++++++++++++++++++---------------------- debian/patches/series | 1 + 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/debian/patches/35_ivy_23.diff b/debian/patches/35_ivy_23.diff index 3719a0d..1458a0d 100644 --- a/debian/patches/35_ivy_23.diff +++ b/debian/patches/35_ivy_23.diff @@ -1,54 +1,51 @@ --- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NoOpRepositoryCacheManager.java +++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NoOpRepositoryCacheManager.java -@@ -55,12 +55,17 @@ - return null; - } +@@ -73,4 +73,15 @@ + public void saveResolvedRevision(ModuleRevisionId dynamicMrid, String revision) { + } ++ ++ @Override + public org.apache.ivy.core.report.ArtifactDownloadReport downloadRepositoryResource(org.apache.ivy.plugins.repository.Resource resource, -+ java.lang.String name, java.lang.String type, java.lang.String extension, org.apache.ivy.core.cache.CacheResourceOptions options, org.apache.ivy.plugins.repository.Repository repository) { ++ String name, ++ String type, ++ String extension, ++ org.apache.ivy.core.cache.CacheResourceOptions options, ++ org.apache.ivy.plugins.repository.Repository repository) { + return null; + } + - public ArtifactDownloadReport download(Artifact artifact, ArtifactResourceResolver resourceResolver, ResourceDownloader resourceDownloader, CacheDownloadOptions options) { - ArtifactDownloadReport report = new ArtifactDownloadReport(null); - report.setDownloadStatus(DownloadStatus.NO); - return report; - } -- -+ - public ResolvedModuleRevision cacheModuleDescriptor(DependencyResolver resolver, ResolvedResource orginalMetadataRef, DependencyDescriptor dd, Artifact requestedMetadataArtifact, ResourceDownloader downloader, CacheMetadataOptions options) throws ParseException { - return null; - } ---- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java -+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java -@@ -318,8 +318,7 @@ - } - - DefaultExtendsDescriptor ed = new DefaultExtendsDescriptor( -- parent.getModuleRevisionId(), -- parent.getResolvedModuleRevisionId(), -+ parent, - attributes.getValue("location"), - extendTypes.toArray(new String[extendTypes.size()])); - getMd().addInheritedDescriptor(ed); -@@ -924,4 +923,4 @@ - public String toString() { - return "ivy parser"; - } --} -\ No newline at end of file -+} ---- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/AbstractRepositoryCacheManager.java -+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/AbstractRepositoryCacheManager.java -@@ -63,6 +63,11 @@ - return null; + } +--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManager.java ++++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManager.java +@@ -158,4 +158,13 @@ + return new ResolvedModuleRevision(resolver, resolver, md, madr); } ++ @Override + public org.apache.ivy.core.report.ArtifactDownloadReport downloadRepositoryResource(org.apache.ivy.plugins.repository.Resource resource, -+ java.lang.String name, java.lang.String type, java.lang.String extension, org.apache.ivy.core.cache.CacheResourceOptions options, org.apache.ivy.plugins.repository.Repository repository) { ++ String name, ++ String type, ++ String extension, ++ org.apache.ivy.core.cache.CacheResourceOptions options, ++ org.apache.ivy.plugins.repository.Repository repository) { + return null; + } -+ - public void originalToCachedModuleDescriptor(DependencyResolver resolver, ResolvedResource originalMetadataRef, Artifact requestedMetadataArtifact, ResolvedModuleRevision rmr, ModuleDescriptorWriter writer) { + } +--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/LocalFileRepositoryCacheManager.java ++++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/LocalFileRepositoryCacheManager.java +@@ -85,4 +85,14 @@ + ModuleDescriptor descriptor = parseModuleDescriptor(resolver, moduleArtifact, options, file, resolvedResource.getResource()); + return new ResolvedModuleRevision(resolver, resolver, descriptor, report); } - ++ ++ @Override ++ public org.apache.ivy.core.report.ArtifactDownloadReport downloadRepositoryResource(org.apache.ivy.plugins.repository.Resource resource, ++ String name, ++ String type, ++ String extension, ++ org.apache.ivy.core.cache.CacheResourceOptions options, ++ org.apache.ivy.plugins.repository.Repository repository) { ++ return null; ++ } + } diff --git a/debian/patches/series b/debian/patches/series index a966d98..c0384f5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,6 +6,7 @@ fix_asm5_version.diff fix_DocGenerationException.diff 03_plexus.diff 13_fix_javadocs_links.diff +35_ivy_23.diff 36_java8_compatibility.diff 37_replace_internal_testng_api.diff 38_use_jdk7_nio_file_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
