Changeset 1595 for trunk/config/ivy.xml

Show
Ignore:
Timestamp:
02/11/10 20:12:45 (2 years ago)
Author:
amandel
Message:

- Update IVY to 2.1.0
- refresh ivy.xml as needed for the update and clean up a bit

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/config/ivy.xml

    r1400 r1595  
    22<?xml-stylesheet type="text/xsl" 
    33    href="http://www.jayasoft.fr/org/ivyrep/ivy-doc.xsl"?> 
    4 <ivy-module version="1.1"> 
     4<ivy-module version="2.0"  
     5            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     6            xsi:noNamespaceSchemaLocation= 
     7                   "http://ant.apache.org/ivy/schemas/ivy.xsd"> 
    58    <info 
    69        organisation="jCoderZ.org" 
    … …  
    5457            <artifact name="xdoclet-bea-module" type="jar"/> 
    5558        </dependency> 
    56         <dependency org="xerces" name="xercesImpl" rev="2.9.1"> 
     59        <!-- If we get rid of xml-apis, org should be xerces --> 
     60        <dependency org="org.apache" name="xercesImpl" rev="2.9.1"> 
    5761            <artifact name="xercesImpl"/> 
    5862            <artifact name="xml-apis"/> 
    5963        </dependency> 
    60         <dependency org="xalan" name="xalan" rev="2.7.1"> 
    61             <artifact name="xalan"/> 
    62             <artifact name="serializer"/> 
     64        <dependency org="xalan" name="xalan" rev="2.7.1"/> 
     65        <dependency org="xalan" name="serializer" rev="2.7.1"/> 
     66        <dependency org="pmd" name="pmd" rev="4.2.3"/> 
     67        <dependency org="jedit" name="jedit" rev="4.3pre16"> 
     68            <artifact name="jedit-install" type="jar"/> 
    6369        </dependency> 
    64         <dependency org="pmd" name="pmd" rev="4.2.3"/> 
    6570 
    6671<!-- 
    … …  
    7176 --> 
    7277 
    73     <!--  Things below here come from an official repository --> 
     78    <!--  Things below here are from an official repository --> 
    7479        <dependency org="org.hibernate" 
    7580          name="hibernate" rev="3.2.6.ga" transitive="true"> 
    7681            <artifact name="hibernate"/> 
    7782            <exclude name="jta"/> 
     83            <exclude org="commons-logging"/> 
    7884        </dependency> 
    7985        <dependency org="org.hibernate" 
    … …  
    8591            <artifact name="hibernate-annotations"/> 
    8692            <exclude name="jta"/> 
     93            <exclude org="commons-logging"/> 
    8794        </dependency> 
    8895        <dependency org="org.apache.derby" name="derby" rev="10.4.1.3"/> 
    8996        <dependency org="xom" name="xom" rev="1.1" /> 
    9097 
    91         <dependency org="org.apache.ant" name="ant" rev="1.7.0" /> 
    92         <dependency org="log4j" name="log4j" rev="1.2.14" /> 
     98        <dependency org="ant" name="ant" rev="1.7.0" /> 
     99        <dependency org="org.slf4j" name="slf4j-jdk14" rev="1.5.+" transitive="true"/> 
     100        <dependency org="org.slf4j" name="log4j-over-slf4j" rev="1.5.+" transitive="true"/> 
     101        <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.5.+" transitive="true"/> 
     102 
    93103        <dependency org="velocity" name="velocity" rev="1.4" /> 
    94         <dependency org="commons-logging" name="commons-logging" rev="1.1.1" /> 
     104 
    95105        <dependency org="commons-collections" name="commons-collections" rev="2.1.1" /> 
    96106        <dependency org="commons-pool" name="commons-pool" rev="1.4" /> 
    97         <dependency org="commons-httpclient" name="commons-httpclient" rev="3.1" /> 
     107        <dependency org="commons-httpclient" name="commons-httpclient" rev="3.1"> 
     108            <exclude org="commons-logging"/> 
     109        </dependency> 
    98110        <dependency org="commons-cli" name="commons-cli" rev="1.1" /> 
    99         <dependency org="commons-codec" name="commons-codec" rev="1.3" /> 
    100         <dependency org="commons-beanutils" name="commons-beanutils" rev="1.7.0" /> 
     111        <dependency org="commons-beanutils" name="commons-beanutils" rev="1.7.0"> 
     112            <exclude org="commons-logging"/> 
     113        </dependency> 
    101114        <dependency org="oro" name="oro" rev="2.0.8"/> 
    102115        <dependency org="junit" name="junit" rev="3.8.2"/> 
    … …  
    110123        <dependency org="jivesoftware" name="smackx" rev="2.2.1"/> 
    111124 
    112         <dependency org="antlr" name="antlr" rev="2.7.2" /> 
    113125        <dependency org="bcel" name="bcel" rev="5.1"/> 
    114126        <!-- jcoverage fork --> 
    115         <dependency org="cobertura" name="cobertura" rev="1.7" /> 
     127        <dependency org="cobertura" name="cobertura" rev="1.7"> 
     128                <exclude name="log4j"/> 
     129        </dependency> 
    116130        <dependency org="javancss" name="javancss" rev="21.41"/> 
    117131        <dependency org="javancss" name="ccl" rev="21.41"/> 
    … …  
    124138        <dependency org="asm" name="asm-util" rev="3.1" /> 
    125139        <dependency org="asm" name="asm-xml" rev="3.1" /> 
    126         <dependency org="asm" name="asm" rev="3.1" /> 
    127140 
    128141        <dependency org="jaxen" name="jaxen" rev="1.1.1"/> 
    129142        <dependency org="saxpath" name="saxpath" rev="1.0-FCS"/> 
    130143        <dependency org="dom4j" name="dom4j" rev="1.6.1"/> 
    131         <dependency org="checkstyle" name="checkstyle" rev="4.4"/> 
     144        <dependency org="checkstyle" name="checkstyle" rev="4.4"> 
     145                    <exclude org="commons-logging"/> 
     146        </dependency> 
    132147        <dependency org="urbanophile" name="java-getopt" rev="1.0.9"/> 
    133148        <dependency org="saxon" name="saxon" rev="6.5.3"/> 
    134149        <dependency org="xml-resolver" name="xml-resolver" rev="1.2"/> 
    135150 
    136         <dependency org="org.apache.xmlgraphics" name="fop" rev="0.94" /> 
     151        <dependency org="org.apache.xmlgraphics" name="fop" rev="0.94"> 
     152            <exclude org="commons-logging"/> 
     153        </dependency> 
    137154        <dependency org="avalon-framework" name="avalon-framework" rev="4.1.5"> 
    138155            <artifact name="avalon-framework" type="jar"/> 
    … …  
    141158        <dependency org="emma" name="emma" rev="2.0.5312"/> 
    142159        <dependency org="emma" name="emma_ant" rev="2.0.5312"/> 
    143  
    144         <dependency org="jedit" name="jedit" rev="4.3pre16"> 
    145             <artifact name="jedit-install" type="jar"/> 
    146         </dependency> 
    147160   </dependencies> 
    148161