ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1241179 - in /ant/core/branches/ANT_18_BRANCH: ./ manual/ manual/Tasks/ release/ src/etc/poms/ src/etc/poms/ant-antlr/ src/etc/poms/ant-apache-bcel/ src/etc/poms/ant-apache-bsf/ src/etc/poms/ant-apache-log4j/ src/etc/poms/ant-apache-oro/ s...
Date Mon, 06 Feb 2012 21:04:44 GMT
Author: bodewig
Date: Mon Feb  6 21:04:42 2012
New Revision: 1241179

URL: http://svn.apache.org/viewvc?rev=1241179&view=rev
Log:
merge from trunk and bump version

Modified:
    ant/core/branches/ANT_18_BRANCH/   (props changed)
    ant/core/branches/ANT_18_BRANCH/STATUS
    ant/core/branches/ANT_18_BRANCH/WHATSNEW
    ant/core/branches/ANT_18_BRANCH/build.xml
    ant/core/branches/ANT_18_BRANCH/manual/Tasks/include.html   (props changed)
    ant/core/branches/ANT_18_BRANCH/manual/cover.html
    ant/core/branches/ANT_18_BRANCH/manual/credits.html
    ant/core/branches/ANT_18_BRANCH/release/ivy.xml
    ant/core/branches/ANT_18_BRANCH/release/ivysettings.xml
    ant/core/branches/ANT_18_BRANCH/release/signit.xml   (contents, props changed)
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-antlr/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-bcel/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-bsf/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-log4j/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-oro/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-regexp/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-resolver/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-xalan2/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-commons-logging/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-commons-net/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jai/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-javamail/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jdepend/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jmf/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jsch/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-junit/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-junit4/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-launcher/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-netrexx/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-swing/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-testutil/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/poms/pom.xml
    ant/core/branches/ANT_18_BRANCH/src/etc/testcases/taskdefs/conditions/antversion.xml
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarBuffer.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarEntry.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarOutputStream.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ExtraFieldUtils.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/FallbackZipEncoding.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/NioZipEncoding.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodePathExtraField.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnrecognizedExtraField.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncoding.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncodingHelper.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEntry.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipFile.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipOutputStream.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipUtil.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java   (props changed)

Propchange: ant/core/branches/ANT_18_BRANCH/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1 @@
-/ant/core/trunk:1240672-1240680
+/ant/core/trunk:1240672-1241172

Modified: ant/core/branches/ANT_18_BRANCH/STATUS
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/STATUS?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/STATUS (original)
+++ ant/core/branches/ANT_18_BRANCH/STATUS Mon Feb  6 21:04:42 2012
@@ -2,9 +2,9 @@ Apache Ant Status
 Last modified at 2010-07-20
 
 Release:
-    Current:        1.8.1  (in SVN Tag: ANT_181)
+    Current:        1.8.2  (in SVN Tag: ANT_182)
     Maintenance:    -
-    Development:    1.8.2  (in SVN Branch: trunk)
+    Development:    1.8.4  (in SVN Branch: ANT_18_BRANCH)
 
 Assets:
     DNS:                ant.apache.org

Modified: ant/core/branches/ANT_18_BRANCH/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/WHATSNEW?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/WHATSNEW (original)
+++ ant/core/branches/ANT_18_BRANCH/WHATSNEW Mon Feb  6 21:04:42 2012
@@ -1,3 +1,15 @@
+Changes from Ant 1.8.3 TO Ant 1.8.4
+===================================
+
+Changes that could break older environments:
+-------------------------------------------
+
+Fixed bugs:
+-----------
+
+Other changes:
+--------------
+
 Changes from Ant 1.8.2 TO Ant 1.8.3
 ===================================
 

Modified: ant/core/branches/ANT_18_BRANCH/build.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/build.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/build.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/build.xml Mon Feb  6 21:04:42 2012
@@ -34,10 +34,10 @@
   <property name="name" value="ant"/>
   <!-- this is the groupId of ant in the Maven repository -->
   <property name="groupid" value="org/apache/ant"/>
-  <property name="project.version" value="1.8.3"/>
+  <property name="project.version" value="1.8.4alpha"/>
   <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
-  <property name="pom.version" value="1.8.3"/>
-  <property name="manifest-version" value="1.8.3"/>
+  <property name="pom.version" value="1.8.4-SNAPSHOT"/>
+  <property name="manifest-version" value="1.8.4"/>
   <property name="bootstrap.jar" value="ant-bootstrap.jar"/>
 
   <property name="ant.package" value="org/apache/tools/ant"/>

Propchange: ant/core/branches/ANT_18_BRANCH/manual/Tasks/include.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1,2 @@
 /ant/core/trunk/docs/manual/CoreTasks/import.html:713353
+/ant/core/trunk/manual/Tasks/include.html:1240672-1241172

Modified: ant/core/branches/ANT_18_BRANCH/manual/cover.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/manual/cover.html?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/manual/cover.html (original)
+++ ant/core/branches/ANT_18_BRANCH/manual/cover.html Mon Feb  6 21:04:42 2012
@@ -19,14 +19,14 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant 1.8.3 User Manual</title>
+<title>Apache Ant 1.8.4 User Manual</title>
 </head>
 
 <body bgcolor="#FFFFFF">
 <div align="center"> 
   <h1><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
-  <h1>Apache Ant&trade; 1.8.3 Manual</h1>
-  <p align="left">This is the manual for version 1.8.3 of 
+  <h1>Apache Ant&trade; 1.8.4 Manual</h1>
+  <p align="left">This is the manual for version 1.8.4 of 
   <a target="_top" href="http://ant.apache.org/index.html">Apache Ant</a>. 
     If your version 
     of Ant (as verified with <tt>ant -version</tt>) is older or newer than this 

Modified: ant/core/branches/ANT_18_BRANCH/manual/credits.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/manual/credits.html?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/manual/credits.html (original)
+++ ant/core/branches/ANT_18_BRANCH/manual/credits.html Mon Feb  6 21:04:42 2012
@@ -62,7 +62,7 @@
 </ul>
 
 <center>
-<p>Version: 1.8.3</p>
+<p>Version: 1.8.4</p>
 </center>
 
 

Modified: ant/core/branches/ANT_18_BRANCH/release/ivy.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/release/ivy.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/release/ivy.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/release/ivy.xml Mon Feb  6 21:04:42 2012
@@ -20,138 +20,144 @@
             xsi:noNamespaceSchemaLocation=
 	    "http://ant.apache.org/ivy/schemas/ivy.xsd">
   <info organisation="org/apache"
-        module="ant" revision="1.8.3"/>
-  <publications>  
+        module="ant" revision="1.8.4"/>
+  <publications xmlns:e="urn:ant.apache.org:ivy-extras">  
     <artifact name="ant-parent" type="pom" ext="pom"/>
     <artifact name="ant-parent" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant" type="pom" ext="pom"/>
     <artifact name="ant" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant" type="jar" ext="jar"/>
     <artifact name="ant" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant" type="sources.asc" ext="jar.asc" classifier="sources" />
-    <artifact name="ant" type="javadocs" ext="jar" classifier="javadocs" />
-    <artifact name="ant" type="javadocs.asc" ext="jar.asc" classifier="javadocs" />
+    <artifact name="ant" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant" type="javadocs" ext="jar" e:classifier="javadocs" />
+    <artifact name="ant" type="javadocs.asc" ext="jar.asc" e:classifier="javadocs" />
     <artifact name="ant-antlr" type="pom" ext="pom"/>
     <artifact name="ant-antlr" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-antlr" type="jar" ext="jar"/>
     <artifact name="ant-antlr" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-antlr" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-antlr" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-antlr" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-antlr" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-apache-bcel" type="pom" ext="pom"/>
     <artifact name="ant-apache-bcel" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-bcel" type="jar" ext="jar"/>
     <artifact name="ant-apache-bcel" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-bcel" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-apache-bcel" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-apache-bcel" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-apache-bcel" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-apache-bsf" type="pom" ext="pom"/>
     <artifact name="ant-apache-bsf" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-bsf" type="jar" ext="jar"/>
     <artifact name="ant-apache-bsf" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-bsf" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-apache-bsf" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-apache-bsf" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-apache-bsf" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-apache-log4j" type="pom" ext="pom"/>
     <artifact name="ant-apache-log4j" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-log4j" type="jar" ext="jar"/>
     <artifact name="ant-apache-log4j" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-log4j" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-apache-log4j" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-apache-log4j" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-apache-log4j" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-apache-oro" type="pom" ext="pom"/>
     <artifact name="ant-apache-oro" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-oro" type="jar" ext="jar"/>
     <artifact name="ant-apache-oro" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-oro" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-apache-oro" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-apache-oro" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-apache-oro" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-apache-regexp" type="pom" ext="pom"/>
     <artifact name="ant-apache-regexp" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-regexp" type="jar" ext="jar"/>
     <artifact name="ant-apache-regexp" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-regexp" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-apache-regexp" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-apache-regexp" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-apache-regexp" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-apache-resolver" type="pom" ext="pom"/>
     <artifact name="ant-apache-resolver" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-resolver" type="jar" ext="jar"/>
     <artifact name="ant-apache-resolver" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-resolver" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-apache-resolver" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-apache-resolver" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-apache-resolver" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-apache-xalan2" type="pom" ext="pom"/>
     <artifact name="ant-apache-xalan2" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-xalan2" type="jar" ext="jar"/>
     <artifact name="ant-apache-xalan2" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-xalan2" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-apache-xalan2" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-apache-xalan2" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-apache-xalan2" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-commons-logging" type="pom" ext="pom"/>
     <artifact name="ant-commons-logging" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-commons-logging" type="jar" ext="jar"/>
     <artifact name="ant-commons-logging" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-commons-logging" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-commons-logging" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-commons-logging" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-commons-logging" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-commons-net" type="pom" ext="pom"/>
     <artifact name="ant-commons-net" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-commons-net" type="jar" ext="jar"/>
     <artifact name="ant-commons-net" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-commons-net" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-commons-net" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-commons-net" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-commons-net" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-jai" type="pom" ext="pom"/>
     <artifact name="ant-jai" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jai" type="jar" ext="jar"/>
     <artifact name="ant-jai" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-jai" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-jai" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-jai" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-jai" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-javamail" type="pom" ext="pom"/>
     <artifact name="ant-javamail" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-javamail" type="jar" ext="jar"/>
     <artifact name="ant-javamail" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-javamail" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-javamail" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-javamail" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-javamail" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-jdepend" type="pom" ext="pom"/>
     <artifact name="ant-jdepend" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jdepend" type="jar" ext="jar"/>
     <artifact name="ant-jdepend" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-jdepend" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-jdepend" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-jdepend" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-jdepend" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-jmf" type="pom" ext="pom"/>
     <artifact name="ant-jmf" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jmf" type="jar" ext="jar"/>
     <artifact name="ant-jmf" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-jmf" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-jmf" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-jmf" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-jmf" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-jsch" type="pom" ext="pom"/>
     <artifact name="ant-jsch" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jsch" type="jar" ext="jar"/>
     <artifact name="ant-jsch" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-jsch" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-jsch" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-jsch" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-jsch" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-junit" type="pom" ext="pom"/>
     <artifact name="ant-junit" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-junit" type="jar" ext="jar"/>
     <artifact name="ant-junit" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-junit" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-junit" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-junit" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-junit" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-junit4" type="pom" ext="pom"/>
+    <artifact name="ant-junit4" type="pom.asc" ext="pom.asc"/>
+    <artifact name="ant-junit4" type="jar" ext="jar"/>
+    <artifact name="ant-junit4" type="jar.asc" ext="jar.asc"/>
+    <artifact name="ant-junit4" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-junit4" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-launcher" type="pom" ext="pom"/>
     <artifact name="ant-launcher" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-launcher" type="jar" ext="jar"/>
     <artifact name="ant-launcher" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-launcher" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-launcher" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-launcher" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-launcher" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-netrexx" type="pom" ext="pom"/>
     <artifact name="ant-netrexx" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-netrexx" type="jar" ext="jar"/>
     <artifact name="ant-netrexx" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-netrexx" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-netrexx" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-netrexx" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-netrexx" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-swing" type="pom" ext="pom"/>
     <artifact name="ant-swing" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-swing" type="jar" ext="jar"/>
     <artifact name="ant-swing" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-swing" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-swing" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-swing" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-swing" type="source.asc" ext="jar.asc" e:classifier="sources" />
     <artifact name="ant-testutil" type="pom" ext="pom"/>
     <artifact name="ant-testutil" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-testutil" type="jar" ext="jar"/>
     <artifact name="ant-testutil" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-testutil" type="sources" ext="jar" classifier="sources" />
-    <artifact name="ant-testutil" type="sources.asc" ext="jar.asc" classifier="sources" />
+    <artifact name="ant-testutil" type="source" ext="jar" e:classifier="sources" />
+    <artifact name="ant-testutil" type="source.asc" ext="jar.asc" e:classifier="sources" />
   </publications>
   <dependencies/> 
 </ivy-module>

Modified: ant/core/branches/ANT_18_BRANCH/release/ivysettings.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/release/ivysettings.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/release/ivysettings.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/release/ivysettings.xml Mon Feb  6 21:04:42 2012
@@ -20,7 +20,7 @@
   <resolvers>
     <ibiblio name="public" m2compatible="true"/>
     <url name="nexus">
-      <artifact pattern="${upload.url}/[organisation]/[module]/[artifact]/[revision]/[artifact]-[revision].[ext]" />
+      <artifact pattern="${upload.url}/[organisation]/[module]/[artifact]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
     </url>
   </resolvers>
   <modules>

Modified: ant/core/branches/ANT_18_BRANCH/release/signit.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/release/signit.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/release/signit.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/release/signit.xml Mon Feb  6 21:04:42 2012
@@ -1,45 +1,49 @@
-<?xml version="1.0"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<project name="signit">
-  <!-- use this property file to enter your default key id -->
-  <property file="${user.home}/gnupg.properties"/>
-  <taskdef resource="org/apache/commons/openpgp/ant/antlib.xml">
-    <classpath>
-      <pathelement
-        location="${user.home}/.m2/repository/org/bouncycastle/bcprov-jdk12/130/bcprov-jdk12-130.jar"/>
-      <pathelement
-        location="${user.home}/.m2/repository/org/apache/commons/commons-openpgp/1.0-SNAPSHOT/commons-openpgp-1.0-SNAPSHOT.jar"/>
-      <pathelement
-        location="${user.home}/.m2/repository/org/bouncycastle/bcpg-jdk12/130/bcpg-jdk12-130.jar"/>
-    </classpath>
-  </taskdef>
-  <signer secring="${user.home}/AppData/Roaming/gnupg/secring.gpg"
-    pubring="${user.home}/AppData/Roaming/gnupg/pubring.gpg" password="${password}" keyid="${keyid}">
-    <fileset dir="../java-repository">
-      <include name="**/*.jar"/>
-      <include name="**/*.pom"/>
-    </fileset>
-    <fileset dir="../distribution">
-      <include name="**/*.bz2"/>
-      <include name="**/*.zip"/>
-      <include name="**/*.gz"/>
-    </fileset>
-  </signer>
-
-</project>
+<?xml version="1.0"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="signit">
+  <!-- use this property file to enter your default key id -->
+  <property file="${user.home}/gnupg.properties"/>
+  <taskdef resource="org/apache/commons/openpgp/ant/antlib.xml">
+    <classpath>
+      <pathelement
+        location="${user.home}/.m2/repository/org/bouncycastle/bcprov-jdk12/130/bcprov-jdk12-130.jar"/>
+      <pathelement
+        location="${user.home}/.m2/repository/org/apache/commons/commons-openpgp/1.0-SNAPSHOT/commons-openpgp-1.0-SNAPSHOT.jar"/>
+      <pathelement
+        location="${user.home}/.m2/repository/org/bouncycastle/bcpg-jdk12/130/bcpg-jdk12-130.jar"/>
+    </classpath>
+  </taskdef>
+  <condition property="gpg.dir" value="${user.home}/AppData/Roaming/gnupg">
+    <os family="windows"/>
+  </condition>
+  <property name="gpg.dir" location="${user.home}/.gnupg"/>
+  <signer secring="${gpg.dir}/secring.gpg"
+    pubring="${gpg.dir}/pubring.gpg" password="${password}" keyid="${keyid}">
+    <fileset dir="../java-repository">
+      <include name="**/*.jar"/>
+      <include name="**/*.pom"/>
+    </fileset>
+    <fileset dir="../distribution">
+      <include name="**/*.bz2"/>
+      <include name="**/*.zip"/>
+      <include name="**/*.gz"/>
+    </fileset>
+  </signer>
+
+</project>

Propchange: ant/core/branches/ANT_18_BRANCH/release/signit.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-antlr/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-antlr/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-antlr/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-antlr/pom.xml Mon Feb  6 21:04:42 2012
@@ -27,12 +27,12 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-antlr</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + ANTLR</name>
   <description>antlr specific task.
     The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <optional>true</optional>
       <scope>compile</scope>
     </dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-bcel/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-bcel/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-bcel/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-bcel/pom.xml Mon Feb  6 21:04:42 2012
@@ -27,18 +27,18 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bcel</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + BCEL</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-bsf/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-bsf/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-bsf/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-bsf/pom.xml Mon Feb  6 21:04:42 2012
@@ -27,18 +27,18 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bsf</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + BSF</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-log4j/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-log4j/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-log4j/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-log4j/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,18 +26,18 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-log4j</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + Log4J</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-oro/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-oro/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-oro/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-oro/pom.xml Mon Feb  6 21:04:42 2012
@@ -27,18 +27,18 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-oro</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + Apache Oro</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-regexp/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-regexp/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-regexp/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-regexp/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,18 +26,18 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-regexp</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + Apache Regexp</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-resolver/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-resolver/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-resolver/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-resolver/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,18 +26,18 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-resolver</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + Apache Resolver</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-xalan2/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-xalan2/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-xalan2/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-apache-xalan2/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-xalan2</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + Xalan 2</name>
   <description>contains Xalan2-specific features</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-commons-logging/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-commons-logging/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-commons-logging/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-commons-logging/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-logging</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + Commons Logging</name>
   <description>Ant Listener based on commons-logging</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-commons-net/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-commons-net/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-commons-net/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-commons-net/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-net</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + Commons Net</name>
   <description>ftp, rexec and telnet tasks</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jai/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jai/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jai/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jai/pom.xml Mon Feb  6 21:04:42 2012
@@ -27,12 +27,12 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jai</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + JAI</name>
   <description>image task and corresponding types.
   </description>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-javamail/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-javamail/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-javamail/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-javamail/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,12 +26,12 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-javamail</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + JavaMail</name>
   <description>implementation of the mail task based on javamail.
     Required to send emails to SMTP servers using user/password combinations
@@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jdepend/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jdepend/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jdepend/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jdepend/pom.xml Mon Feb  6 21:04:42 2012
@@ -27,12 +27,12 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jdepend</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + JDepend</name>
   <description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the
     jdepend parser available on the maven repository</description>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jmf/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jmf/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jmf/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jmf/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,12 +26,12 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jmf</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + JMF</name>
   <description>contains the sound task and a soundplayer listener
     download the dependency from http://java.sun.com/products/java-media/jmf/</description>
@@ -39,7 +39,7 @@ xsi:schemaLocation="http://maven.apache.
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jsch/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jsch/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jsch/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-jsch/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,12 +26,12 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jsch</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + JSch</name>
   <description>contains the sshexec and scp tasks
   jsch 0.1.29 might not be available from maven</description>
@@ -39,7 +39,7 @@ xsi:schemaLocation="http://maven.apache.
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-junit/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-junit/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-junit/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-junit/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-junit</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + JUnit</name>
   <description>contains the junit and junirreport tasks</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-junit4/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-junit4/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-junit4/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-junit4/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-junit4</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + JUnit 4</name>
   <description>contains JUnit 4.x support</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-launcher/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-launcher/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-launcher/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-launcher/pom.xml Mon Feb  6 21:04:42 2012
@@ -27,12 +27,12 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-launcher</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant Launcher</name>
   <build>
     <plugins>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-netrexx/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-netrexx/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-netrexx/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-netrexx/pom.xml Mon Feb  6 21:04:42 2012
@@ -26,12 +26,12 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-netrexx</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + NetRexx</name>
   <description>NetRexxC task
     dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description>
@@ -39,7 +39,7 @@ xsi:schemaLocation="http://maven.apache.
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <!-- Processed too early, before maven-antrun-plugin gets a chance to work:

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-swing/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-swing/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-swing/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-swing/pom.xml Mon Feb  6 21:04:42 2012
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-swing</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant + Swing</name>
   <description>a listener and a splash task based on Swing</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-testutil/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-testutil/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-testutil/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant-testutil/pom.xml Mon Feb  6 21:04:42 2012
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-testutil</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant Test Utilities</name>
   <description>test utility classes</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
      <dependency>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/ant/pom.xml Mon Feb  6 21:04:42 2012
@@ -27,18 +27,18 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <name>Apache Ant Core</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-launcher</artifactId>
-      <version>1.8.3</version>
+      <version>1.8.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/poms/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/poms/pom.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/poms/pom.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/poms/pom.xml Mon Feb  6 21:04:42 2012
@@ -25,7 +25,7 @@ xsi:schemaLocation="http://maven.apache.
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-parent</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>master POM</description>
   <licenses>

Modified: ant/core/branches/ANT_18_BRANCH/src/etc/testcases/taskdefs/conditions/antversion.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/etc/testcases/taskdefs/conditions/antversion.xml?rev=1241179&r1=1241178&r2=1241179&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/etc/testcases/taskdefs/conditions/antversion.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/etc/testcases/taskdefs/conditions/antversion.xml Mon Feb  6 21:04:42 2012
@@ -45,10 +45,10 @@
 		<fail>
 			<condition>
 				<not>
-					<antversion atleast="1.9.0" />
+					<antversion atleast="1.8.4" />
 				</not>
 			</condition>
-  	  	Should be at least 1.9.0
+  	  	Should be at least 1.8.4
   		</fail>
 	</target>
 
@@ -57,10 +57,10 @@
 		<fail>
 			<condition>
 				<not>
-					<antversion exactly="1.9.0" />
+					<antversion exactly="1.8.4" />
 				</not>
 			</condition>
-	  	  Should be exactly 1.9.0
+	  	  Should be exactly 1.8.4
 	  	</fail>
 	</target>
 </project>

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1,2 @@
 /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java:945039
+/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java:1240672-1241172

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarBuffer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1,2 @@
+/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java:1240672-1241172
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java:1027427

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1,2 @@
+/ant/core/trunk/src/main/org/apache/tools/tar/TarEntry.java:1240672-1241172
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java:755227,755472

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1,2 @@
+/ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java:1240672-1241172
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java:1027427

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1,2 @@
+/ant/core/trunk/src/main/org/apache/tools/zip:1240672-1241172
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:746933,748133,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089,1240672-1240680
+/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089,1240672-1241172
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java:746933,748063,748133,748288,749342,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ExtraFieldUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,3 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java:1240672-1241172
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java:910483-910521
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java:745528,746933,748133,749524,749603,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/FallbackZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089,1240672-1240680
+/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089,1240672-1241172
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java:749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/NioZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089,1240672-1240680
+/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089,1240672-1241172
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java:749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1,2 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java:1240672-1241172
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089,1240672-1240680
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089,1240672-1241172
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java:746933,748063,748133,749342,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodePathExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089,1240672-1240680
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089,1240672-1241172
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java:746933,748063,748133,749342,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java:1240672-1240680
+/ant/core/trunk/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java:1240672-1241172

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnrecognizedExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,3 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/UnrecognizedExtraField.java:1240672-1241172
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java:910483-910521
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java:746933,748133,749603,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089,1240672-1240680
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089,1240672-1241172
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncoding.java:749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncodingHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089,1240672-1240680
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089,1240672-1241172
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:909456
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:746933,747841,748133,749342-749344,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,3 +1,4 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java:1240672-1241172
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:910483-910521
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:747850,749603
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java:746933,748133,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,3 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:1240672-1241172
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:911740,1146027,1153735
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:745920,746933,748133,748556,749342-749344,749524,749603,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,3 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java:1240672-1241172
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:911740
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:745920,747810,747841,748063,749342,749906-749907,750055,750310

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipUtil.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipUtil.java:1240672-1240680
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipUtil.java:1240672-1241172

Propchange: ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1,2 @@
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip:1240672-1241172
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip:749906-749907

Propchange: ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,3 @@
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java:1240672-1241172
 /commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java:910483-910521
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java:749906-749907

Propchange: ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1 +1,2 @@
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java:1240672-1241172
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java:749342-749344,749906-749907

Propchange: ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 21:04:42 2012
@@ -1,2 +1,3 @@
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:1240672-1241172
 /commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:896818
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:749603



Mime
View raw message