This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository gradle.
commit 368027e49a6cd4b036d903fcceae394e06e69373 Author: Markus Koschany <[email protected]> Date: Wed Nov 11 19:54:28 2015 +0100 Add ivy-2.4.0.patch and fix FTBFS with ivy 2.4.0. --- debian/patches/ivy-2.4.0.patch | 47 ++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 48 insertions(+) diff --git a/debian/patches/ivy-2.4.0.patch b/debian/patches/ivy-2.4.0.patch new file mode 100644 index 0000000..921d157 --- /dev/null +++ b/debian/patches/ivy-2.4.0.patch @@ -0,0 +1,47 @@ +From: Markus Koschany <[email protected]> +Date: Wed, 11 Nov 2015 19:53:35 +0100 +Subject: ivy 2.4.0 + +--- + .../ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java | 2 +- + .../component/external/model/DefaultIvyModuleResolveMetaData.java | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java b/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java +index 824ddd4..b0462a1 100644 +--- a/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java ++++ b/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java +@@ -1139,7 +1139,7 @@ public class IvyXmlModuleDescriptorParser extends AbstractModuleDescriptorParser + buffer = null; + state = State.INFO; + } else if (state == State.EXTRA_INFO) { +- getMd().getExtraInfo().put(new NamespaceId(uri, localName), buffer == null ? "" : buffer.toString()); ++ ((Map)getMd().getExtraInfo()).put(new NamespaceId(uri, localName), buffer == null ? "" : buffer.toString()); + buffer = null; + state = State.INFO; + } else if (state == State.DESCRIPTION) { +diff --git a/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java b/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java +index 803a5b3..5f394b9 100644 +--- a/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java ++++ b/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java +@@ -31,17 +31,17 @@ public class DefaultIvyModuleResolveMetaData extends AbstractModuleComponentReso + + public DefaultIvyModuleResolveMetaData(ModuleDescriptor moduleDescriptor) { + super(moduleDescriptor); +- this.extraInfo = moduleDescriptor.getExtraInfo(); ++ this.extraInfo = (Map)moduleDescriptor.getExtraInfo(); + } + + public DefaultIvyModuleResolveMetaData(ModuleComponentIdentifier componentIdentifier, ModuleDescriptor moduleDescriptor) { + super(DefaultModuleVersionIdentifier.newId(componentIdentifier), moduleDescriptor, componentIdentifier); +- this.extraInfo = moduleDescriptor.getExtraInfo(); ++ this.extraInfo = (Map)moduleDescriptor.getExtraInfo(); + } + + private DefaultIvyModuleResolveMetaData(ModuleVersionIdentifier identifier, ModuleDescriptor moduleDescriptor, ModuleComponentIdentifier componentIdentifier) { + super(identifier, moduleDescriptor, componentIdentifier); +- this.extraInfo = moduleDescriptor.getExtraInfo(); ++ this.extraInfo = (Map)moduleDescriptor.getExtraInfo(); + } + + public DefaultIvyModuleResolveMetaData(ModuleComponentIdentifier componentIdentifier, Set<IvyArtifactName> artifacts) { diff --git a/debian/patches/series b/debian/patches/series index 11121d0..70a8a5a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,3 +22,4 @@ maven_builder_support.diff use-bndlib-1.50.0.patch generate_classpath.diff generate_pom.diff +ivy-2.4.0.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
