Changeset 393

Show
Ignore:
Timestamp:
02/09/10 22:19:34 (6 months ago)
Author:
jboudart
Message:

Update to from ant 1.8.0RC1 to ant 1.8.0

Location:
trunk
Files:
47 added
16 removed
3 modified
4 copied
8 moved

Legend:

Unmodified
Added
Removed

  • trunk/ivysettings.xml

    r364 r393  
    3939                        <resolver ref="easyant-extra-modules" /> 
    4040                        <resolver ref="third-party-lib" /> 
    41                         <!--  
    42                         <ibiblio name="ant-distro" root="file:/home/neoverflow/projets/apache-ant-1.8.0RC1/lib/" m2compatible="true"> 
    43                                  
    44                         </ibiblio>  
    45  
    46                         --> 
    4741                        <resolver ref="public-maven" /> 
    48                            
    4942                </chain> 
    5043        </resolvers> 

  • trunk/module.ivy

    r389 r393  
    2626        <dependencies> 
    2727                <dependency org="junit" name="junit" rev="4.4" conf="test->default"/> 
    28                 <dependency org="org.apache.ant" name="ant" rev="1.8.0RC1" conf="default->default"/> 
    29                 <dependency org="org.apache.ant" name="ant-nodeps" rev="1.8.0RC1" conf="default->default"/> 
    30                 <dependency org="org.apache.ant" name="ant-trax" rev="1.8.0RC1" conf="default->default"/> 
     28                <dependency org="org.apache.ant" name="ant" rev="1.8.0" conf="default->default"/> 
     29                <dependency org="org.apache.ant" name="ant-nodeps" rev="1.8.0" conf="default->default"/> 
     30                <dependency org="org.apache.ant" name="ant-trax" rev="1.8.0" conf="default->default"/> 
    3131                <dependency org="org.apache.ivy" name="ivy" rev="2.1.0-patched" conf="default->default"/> 
    3232                <dependency org="ant-contrib" name="ant-contrib" rev="1.0b2" conf="default->default"/> 

  • trunk/repository/third-party-lib/junit/junit/3.8.2/junit.ivy

    r364 r393  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven"> 
    3         <info organisation="org.apache.ant" module="ant-launcher" revision="1.8.0RC1" status="release" publication="20100105224016"> 
    4                 <description homepage=""/> 
    5                 <m:maven.plugins>org.apache.maven.plugins__maven-compiler-plugin__null</m:maven.plugins> 
     3        <info organisation="junit" 
     4                module="junit" 
     5                revision="3.8.2" 
     6                status="release" 
     7                publication="20070514233453" 
     8        > 
     9                <license name="Common Public License Version 1.0" url="http://www.opensource.org/licenses/cpl1.0.txt" /> 
     10                <description homepage="http://junit.org"> 
     11                JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java. 
     12                </description> 
    613        </info> 
    714        <configurations> 
    … …  
    1825        </configurations> 
    1926        <publications> 
    20                 <artifact name="ant-launcher" type="jar" ext="jar" conf="master"/> 
     27                <artifact name="junit" type="jar" ext="jar" conf="master"/> 
     28                <artifact name="junit" type="source" ext="jar" conf="sources" m:classifier="sources"/> 
     29                <artifact name="junit" type="javadoc" ext="jar" conf="javadoc" m:classifier="javadoc"/> 
    2130        </publications> 
    22         <dependencies> 
    23                 <dependency org="junit" name="junit" rev="3.8.2" force="true" conf="test->runtime(*),master(*)"/> 
    24         </dependencies> 
    2531</ivy-module> 

  • trunk/repository/third-party-lib/org.apache.ant/ant-apache-xalan2/1.8.0/ant-apache-xalan2.ivy

    r364 r393  
    22<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven"> 
    33        <info organisation="org.apache.ant" 
    4                 module="ant-nodeps" 
    5                 revision="1.8.0RC1" 
     4                module="ant-apache-xalan2" 
     5                revision="1.8.0" 
    66                status="release" 
    7                 publication="20100105224016" 
     7                publication="20100202013627" 
    88        > 
    99                <description homepage=""> 
    10                 contains all the optional tasks and types which do not have particular dependencies 
     10                contains the junit and junirreport tasks 
    1111                </description> 
    12                 <m:maven.plugins>org.apache.maven.plugins__maven-compiler-plugin__null</m:maven.plugins> 
     12                <m:maven.plugins>null__maven-antrun-plugin__null|org.apache.maven.plugins__maven-compiler-plugin__null</m:maven.plugins> 
    1313        </info> 
    1414        <configurations> 
    … …  
    2525        </configurations> 
    2626        <publications> 
    27                 <artifact name="ant-nodeps" type="jar" ext="jar" conf="master"/> 
     27                <artifact name="ant-apache-xalan2" type="jar" ext="jar" conf="master"/> 
    2828        </publications> 
    2929        <dependencies> 
    30                 <dependency org="org.apache.ant" name="ant" rev="1.8.0RC1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
    31                 <dependency org="xerces" name="xercesImpl" rev="2.9.0" force="true" conf="optional->compile(*),provided(*),master(*)"/> 
    32                 <dependency org="xml-apis" name="xml-apis" rev="1.3.04" force="true" conf="optional->compile(*),master(*)"/> 
     30                <dependency org="org.apache.ant" name="ant" rev="1.8.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
     31                <dependency org="org.apache.ant" name="ant-nodeps" rev="1.8.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
     32                <dependency org="xalan" name="xalan" rev="2.7.1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
    3333                <dependency org="junit" name="junit" rev="3.8.2" force="true" conf="test->runtime(*),master(*)"/> 
    3434        </dependencies> 

  • trunk/repository/third-party-lib/org.apache.ant/ant-junit/1.8.0/ant-junit.ivy

    r364 r393  
    22<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven"> 
    33        <info organisation="org.apache.ant" 
    4                 module="ant-nodeps" 
    5                 revision="1.8.0RC1" 
     4                module="ant-junit" 
     5                revision="1.8.0" 
    66                status="release" 
    7                 publication="20100105224016" 
     7                publication="20100202013626" 
    88        > 
    99                <description homepage=""> 
    10                 contains all the optional tasks and types which do not have particular dependencies 
     10                contains the junit and junirreport tasks 
    1111                </description> 
    12                 <m:maven.plugins>org.apache.maven.plugins__maven-compiler-plugin__null</m:maven.plugins> 
     12                <m:maven.plugins>null__maven-antrun-plugin__null|org.apache.maven.plugins__maven-compiler-plugin__null</m:maven.plugins> 
    1313        </info> 
    1414        <configurations> 
    … …  
    2525        </configurations> 
    2626        <publications> 
    27                 <artifact name="ant-nodeps" type="jar" ext="jar" conf="master"/> 
     27                <artifact name="ant-junit" type="jar" ext="jar" conf="master"/> 
    2828        </publications> 
    2929        <dependencies> 
    30                 <dependency org="org.apache.ant" name="ant" rev="1.8.0RC1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
    31                 <dependency org="xerces" name="xercesImpl" rev="2.9.0" force="true" conf="optional->compile(*),provided(*),master(*)"/> 
    32                 <dependency org="xml-apis" name="xml-apis" rev="1.3.04" force="true" conf="optional->compile(*),master(*)"/> 
     30                <dependency org="org.apache.ant" name="ant" rev="1.8.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
     31                <dependency org="junit" name="junit" rev="3.8.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
    3332                <dependency org="junit" name="junit" rev="3.8.2" force="true" conf="test->runtime(*),master(*)"/> 
    3433        </dependencies> 

  • trunk/repository/third-party-lib/org.apache.ant/ant-launcher/1.8.0/ant-launcher.ivy

    r364 r393  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven"> 
    3         <info organisation="org.apache.ant" module="ant-launcher" revision="1.8.0RC1" status="release" publication="20100105224016"> 
    4                 <description homepage=""/> 
     3        <info organisation="org.apache.ant" 
     4                module="ant-launcher" 
     5                revision="1.8.0" 
     6                status="release" 
     7                publication="20100202013627" 
     8        > 
     9                <description homepage="" /> 
    510                <m:maven.plugins>org.apache.maven.plugins__maven-compiler-plugin__null</m:maven.plugins> 
    611        </info> 

  • trunk/repository/third-party-lib/org.apache.ant/ant-nodeps/1.8.0/ant-nodeps.ivy

    r364 r393  
    33        <info organisation="org.apache.ant" 
    44                module="ant-nodeps" 
    5                 revision="1.8.0RC1" 
     5                revision="1.8.0" 
    66                status="release" 
    7                 publication="20100105224016" 
     7                publication="20100202013627" 
    88        > 
    99                <description homepage=""> 
    … …  
    2828        </publications> 
    2929        <dependencies> 
    30                 <dependency org="org.apache.ant" name="ant" rev="1.8.0RC1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
     30                <dependency org="org.apache.ant" name="ant" rev="1.8.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
    3131                <dependency org="xerces" name="xercesImpl" rev="2.9.0" force="true" conf="optional->compile(*),provided(*),master(*)"/> 
    3232                <dependency org="xml-apis" name="xml-apis" rev="1.3.04" force="true" conf="optional->compile(*),master(*)"/> 

  • trunk/repository/third-party-lib/org.apache.ant/ant-trax/1.8.0/ant-trax.ivy

    r364 r393  
    33        <info organisation="org.apache.ant" 
    44                module="ant-trax" 
    5                 revision="1.8.0RC1" 
     5                revision="1.8.0" 
    66                status="release" 
    7                 publication="20100105224016" 
     7                publication="20100202013626" 
    88        > 
    99                <description homepage=""> 
    … …  
    2828        </publications> 
    2929        <dependencies> 
    30                 <dependency org="org.apache.ant" name="ant" rev="1.8.0RC1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
     30                <dependency org="org.apache.ant" name="ant-apache-xalan2" rev="1.8.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
    3131                <dependency org="xerces" name="xercesImpl" rev="2.9.0" force="true" conf="optional->compile(*),provided(*),master(*)"/> 
    3232                <dependency org="xml-apis" name="xml-apis" rev="1.3.04" force="true" conf="optional->compile(*),master(*)"/> 

  • trunk/repository/third-party-lib/org.apache.ant/ant/1.8.0/ant.ivy

    r364 r393  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven"> 
    3         <info organisation="org.apache.ant" module="ant" revision="1.8.0RC1" status="release" publication="20100105224016"> 
     3        <info organisation="org.apache.ant" 
     4                module="ant" 
     5                revision="1.8.0" 
     6                status="release" 
     7                publication="20100202013627" 
     8        > 
    49                <description homepage=""> 
    510                Apache Ant 
    … …  
    2328        </publications> 
    2429        <dependencies> 
    25                 <dependency org="org.apache.ant" name="ant-launcher" rev="1.8.0RC1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
     30                <dependency org="org.apache.ant" name="ant-launcher" rev="1.8.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
    2631                <dependency org="xerces" name="xercesImpl" rev="2.9.0" force="true" conf="optional->compile(*),provided(*),master(*)"/> 
    2732                <dependency org="xml-apis" name="xml-apis" rev="1.3.04" force="true" conf="optional->compile(*),master(*)"/> 

  • trunk/repository/third-party-lib/xalan/xalan/2.7.0/xalan.ivy

    r364 r393  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven"> 
    3         <info organisation="org.apache.ant" module="ant-launcher" revision="1.8.0RC1" status="release" publication="20100105224016"> 
    4                 <description homepage=""/> 
    5                 <m:maven.plugins>org.apache.maven.plugins__maven-compiler-plugin__null</m:maven.plugins> 
     3        <info organisation="xalan" 
     4                module="xalan" 
     5                revision="2.7.0" 
     6                status="release" 
     7                publication="20051108230738" 
     8        > 
     9                <description homepage="" /> 
    610        </info> 
    711        <configurations> 
    … …  
    1822        </configurations> 
    1923        <publications> 
    20                 <artifact name="ant-launcher" type="jar" ext="jar" conf="master"/> 
     24                <artifact name="xalan" type="jar" ext="jar" conf="master"/> 
     25                <artifact name="xalan" type="source" ext="jar" conf="sources" m:classifier="sources"/> 
    2126        </publications> 
    2227        <dependencies> 
    23                 <dependency org="junit" name="junit" rev="3.8.2" force="true" conf="test->runtime(*),master(*)"/> 
     28                <dependency org="xml-apis" name="xml-apis" rev="2.0.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> 
     29                <dependency org="xerces" name="xercesImpl" rev="2.6.0" force="true" conf="optional->compile(*),master(*)"/> 
    2430        </dependencies> 
    2531</ivy-module> 

  • trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-test/0.1/abstract-test.ivy

    r364 r393  
    3131         
    3232        <dependencies> 
    33                 <dependency org="org.apache.ant" name="ant-junit" rev="1.7.1"/> 
     33                <dependency org="org.apache.ant" name="ant-junit" rev="1.8.0"/> 
    3434        </dependencies> 
    3535