Author: maartenc
Date: Wed Sep 22 22:21:27 2010
New Revision: 1000264
URL: http://svn.apache.org/viewvc?rev=1000264&view=rev
Log:
Merged revisions 1000258, 1000262 and 1000263 from trunk.
Modified:
ant/ivy/core/branches/2.2.x/ (props changed)
ant/ivy/core/branches/2.2.x/build-release.xml
ant/ivy/core/branches/2.2.x/ivy.xml
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
Propchange: ant/ivy/core/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 22:21:27 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-983820,983827-984586,984952,988337,988678,988691-988707,990621-991115,997391,997508-997517,997711-997931,999129,1000206,1000225
+/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-983820,983827-984586,984952,988337,988678,988691-988707,990621-991115,997391,997508-997517,997711-997931,999129,1000206,1000225,1000257-1000263
Modified: ant/ivy/core/branches/2.2.x/build-release.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/build-release.xml?rev=1000264&r1=1000263&r2=1000264&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/build-release.xml (original)
+++ ant/ivy/core/branches/2.2.x/build-release.xml Wed Sep 22 22:21:27 2010
@@ -298,7 +298,7 @@
<zipfileset dir="${artifacts.build.dir}/jars"
includes="${final.name}"
fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
- <zipfileset dir="${build.dir}/lib"
prefix="${snapshot.full.name}/lib" excludes="ant-*.jar" />
+ <zipfileset dir="${build.dir}/lib"
prefix="${snapshot.full.name}/lib" excludes="ant-*.jar,bcpg-*.jar,bcprov*.jar"
/>
</zip>
<tar
destfile="${distrib.dir}/${snapshot.full.name}-bin-with-deps.tar.gz"
compression="gzip" longfile="gnu">
Modified: ant/ivy/core/branches/2.2.x/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/ivy.xml?rev=1000264&r1=1000263&r2=1000264&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/ivy.xml (original)
+++ ant/ivy/core/branches/2.2.x/ivy.xml Wed Sep 22 22:21:27 2010
@@ -51,6 +51,7 @@
<dependency org="commons-vfs" name="commons-vfs" rev="1.0"
conf="default,vfs->default" />
<dependency org="com.jcraft" name="jsch" rev="0.1.31"
conf="default,sftp->default" />
<dependency org="org.bouncycastle" name="bcpg-jdk14" rev="1.45"
conf="default" />
+ <dependency org="org.bouncycastle" name="bcprov-jdk14" rev="1.45"
conf="default" />
<!-- Test dependencies -->
<dependency org="junit" name="junit" rev="3.8.2"
conf="test->default" />
Modified:
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java?rev=1000264&r1=1000263&r2=1000264&view=diff
==============================================================================
---
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
(original)
+++
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
Wed Sep 22 22:21:27 2010
@@ -118,6 +118,13 @@ public final class PomModuleDescriptorWr
continue;
}
+ if (line.trim().length() == 0) {
+ // empty line
+ out.println(line);
+ line = in.readLine();
+ continue;
+ }
+
lastIndent = indent;
indent = line.indexOf('<');
