|
 |
eee8013 |
From db00c7e6770ff68a6f03e02f4a477f6e1d1639b1 Mon Sep 17 00:00:00 2001
|
|
|
0f4f33c |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
0f4f33c |
Date: Mon, 13 Apr 2015 12:27:00 +0200
|
|
 |
ab43c0d |
Subject: [PATCH 08/15] Port to Ivy 2.4.0
|
|
|
0f4f33c |
|
|
|
0f4f33c |
---
|
|
|
bad128e |
.../ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java | 2 +-
|
|
|
bad128e |
.../component/external/model/DefaultIvyModuleResolveMetaData.java | 6 +++---
|
|
|
bad128e |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
0f4f33c |
|
|
|
0f4f33c |
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
|
|
|
73b31f0 |
index c3ea04a..17e9baf 100644
|
|
|
0f4f33c |
--- a/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
|
|
|
0f4f33c |
+++ b/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
|
|
|
d48f512 |
@@ -1135,7 +1135,7 @@ public class IvyXmlModuleDescriptorParser extends AbstractModuleDescriptorParser
|
|
|
0f4f33c |
buffer = null;
|
|
|
0f4f33c |
state = State.INFO;
|
|
|
0f4f33c |
} else if (state == State.EXTRA_INFO) {
|
|
|
0f4f33c |
- getMd().getExtraInfo().put(new NamespaceId(uri, localName), buffer == null ? "" : buffer.toString());
|
|
|
0f4f33c |
+ ((Map)getMd().getExtraInfo()).put(new NamespaceId(uri, localName), buffer == null ? "" : buffer.toString());
|
|
|
0f4f33c |
buffer = null;
|
|
|
0f4f33c |
state = State.INFO;
|
|
|
0f4f33c |
} else if (state == State.DESCRIPTION) {
|
|
|
0f4f33c |
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
|
|
|
794ddeb |
index 803a5b3..5f394b9 100644
|
|
|
0f4f33c |
--- a/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java
|
|
|
0f4f33c |
+++ b/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java
|
|
|
794ddeb |
@@ -31,17 +31,17 @@ public class DefaultIvyModuleResolveMetaData extends AbstractModuleComponentReso
|
|
|
0f4f33c |
|
|
|
0f4f33c |
public DefaultIvyModuleResolveMetaData(ModuleDescriptor moduleDescriptor) {
|
|
|
0f4f33c |
super(moduleDescriptor);
|
|
|
0f4f33c |
- this.extraInfo = moduleDescriptor.getExtraInfo();
|
|
|
0f4f33c |
+ this.extraInfo = (Map)moduleDescriptor.getExtraInfo();
|
|
|
0f4f33c |
}
|
|
|
0f4f33c |
|
|
|
bad128e |
public DefaultIvyModuleResolveMetaData(ModuleComponentIdentifier componentIdentifier, ModuleDescriptor moduleDescriptor) {
|
|
|
bad128e |
super(DefaultModuleVersionIdentifier.newId(componentIdentifier), moduleDescriptor, componentIdentifier);
|
|
|
bad128e |
- this.extraInfo = moduleDescriptor.getExtraInfo();
|
|
|
bad128e |
+ this.extraInfo = (Map)moduleDescriptor.getExtraInfo();
|
|
|
bad128e |
}
|
|
|
bad128e |
|
|
|
bad128e |
private DefaultIvyModuleResolveMetaData(ModuleVersionIdentifier identifier, ModuleDescriptor moduleDescriptor, ModuleComponentIdentifier componentIdentifier) {
|
|
|
0f4f33c |
super(identifier, moduleDescriptor, componentIdentifier);
|
|
|
0f4f33c |
- this.extraInfo = moduleDescriptor.getExtraInfo();
|
|
|
0f4f33c |
+ this.extraInfo = (Map)moduleDescriptor.getExtraInfo();
|
|
|
0f4f33c |
}
|
|
|
0f4f33c |
|
|
|
794ddeb |
public DefaultIvyModuleResolveMetaData(ModuleComponentIdentifier componentIdentifier, Set<IvyArtifactName> artifacts) {
|
|
|
0f4f33c |
--
|
|
|
eee8013 |
2.9.3
|
|
|
0f4f33c |
|