Author: bodewig Date: Thu Aug 19 08:46:49 2010 New Revision: 987079 URL: http://svn.apache.org/viewvc?rev=987079&view=rev Log: complete merge
Modified: ant/antlibs/compress/tags/1_0/ (props changed) ant/antlibs/compress/tags/1_0/project-template.ivy.xml ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/TarResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ZipResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Unzip.java (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/ar-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/cpio-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/tar-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/zip-test.xml (props changed) Propchange: ant/antlibs/compress/tags/1_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1 +1 @@ -/ant/antlibs/compress/trunk:987018-987066 +/ant/antlibs/compress/trunk:987018-987066,987068 Modified: ant/antlibs/compress/tags/1_0/project-template.ivy.xml URL: http://svn.apache.org/viewvc/ant/antlibs/compress/tags/1_0/project-template.ivy.xml?rev=987079&r1=987078&r2=987079&view=diff ============================================================================== --- ant/antlibs/compress/tags/1_0/project-template.ivy.xml (original) +++ ant/antlibs/compress/tags/1_0/project-template.ivy.xml Thu Aug 19 08:46:49 2010 @@ -51,8 +51,7 @@ e:classifier="ivy"/> </publications> <dependencies> - <dependency org="org.apache.ant" name="ant" rev="[1.8.0,)"/> <dependency org="org.apache.commons" name="commons-compress" - rev="[1.1,)"/> + rev="1.1"/> </dependencies> </ivy-module> Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/TarResource.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java:987018-987066 +/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java:987018-987066,987068 /ant/core/trunk/src/main/org/apache/tools/ant/types/resources/TarResource.java:806035 Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ZipResource.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java:987018-987066 +/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java:987018-987066,987068 /ant/core/trunk/src/main/org/apache/tools/ant/types/resources/ZipResource.java:806035 Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Unzip.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unzip.java:987018-987066 +/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unzip.java:987018-987066,987068 /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Expand.java:815599 Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/ar-test.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:987018-987066 +/ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:987018-987066,987068 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:806793 Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/cpio-test.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:987018-987066 +/ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:987018-987066,987068 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:806788 Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/tar-test.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,3 +1,3 @@ -/ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml:987018-987066 +/ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml:987018-987066,987068 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:806788 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:806793 Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/zip-test.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,3 +1,3 @@ -/ant/antlibs/compress/trunk/src/tests/antunit/zip-test.xml:987018-987066 +/ant/antlibs/compress/trunk/src/tests/antunit/zip-test.xml:987018-987066,987068 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:806788 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:806793