You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2010/08/02 00:36:03 UTC
svn commit: r981334 - in /ant/ivy/core/branches/2.2.x: ./ CHANGES.txt
src/java/org/apache/ivy/ant/IvyArtifactReport.java
Author: maartenc
Date: Sun Aug 1 22:36:03 2010
New Revision: 981334
URL: http://svn.apache.org/viewvc?rev=981334&view=rev
Log:
Merged changes for IVY-1212 from trunk into 2.2.x branch.
Modified:
ant/ivy/core/branches/2.2.x/ (props changed)
ant/ivy/core/branches/2.2.x/CHANGES.txt
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyArtifactReport.java
Propchange: ant/ivy/core/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 22:36:03 2010
@@ -1,4 +1,4 @@
/ant/ivy/core/branches/2.0.0:727187-727188,727520-732505
/ant/ivy/core/branches/2.0.0-rc2:707459-708717
/ant/ivy/core/branches/2.0.x:696803-698317
-/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-981329
+/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-981333
Modified: ant/ivy/core/branches/2.2.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/CHANGES.txt?rev=981334&r1=981333&r2=981334&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.2.x/CHANGES.txt Sun Aug 1 22:36:03 2010
@@ -113,6 +113,7 @@ for detailed view of each issue, please
- IMPROVEMENT: Use IvyAuthenticator only when it is really necessary (IVY-1211)
- IMPROVEMENT: ivy:makepom now accepts a list of configurations to include (IVY-1005) (thanks to Jesper Pedersen)
+- FIX: artifactreport ant task doesn't honor log attribute (IVY-1212)
- FIX: XmlModuleDescriptorWriter does not write the transitive attribute (IVY-1207) (thanks to Abel Muino)
- FIX: Ivy info/extends/extendsType attribute is misspelled by XmlModuleDescriptorWriter (IVY-1203) (thanks to Jason Trump)
Modified: ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyArtifactReport.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyArtifactReport.java?rev=981334&r1=981333&r2=981334&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyArtifactReport.java (original)
+++ ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyArtifactReport.java Sun Aug 1 22:36:03 2010
@@ -93,13 +93,20 @@ public class IvyArtifactReport extends I
}
IvyNode[] dependencies = getIvyInstance().getResolveEngine().getDependencies(
md,
- new ResolveOptions().setConfs(confs).setResolveId(
- getResolveId()).setValidate(doValidate(getSettings())), null);
+ ((ResolveOptions) new ResolveOptions()
+ .setLog(getLog()))
+ .setConfs(confs)
+ .setResolveId(getResolveId())
+ .setValidate(doValidate(getSettings())),
+ null);
Map artifactsToCopy = getIvyInstance().getRetrieveEngine().determineArtifactsToCopy(
ModuleRevisionId.newInstance(getOrganisation(), getModule(), getRevision()),
pattern,
- new RetrieveOptions().setConfs(confs).setResolveId(getResolveId()));
+ ((RetrieveOptions) new RetrieveOptions()
+ .setLog(getLog()))
+ .setConfs(confs)
+ .setResolveId(getResolveId()));
Map moduleRevToArtifactsMap = new HashMap();
for (Iterator iter = artifactsToCopy.keySet().iterator(); iter.hasNext();) {