You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2013/04/08 11:42:26 UTC

svn commit: r1465582 - in /ofbiz/trunk: build.xml ivy.xml

Author: jacopoc
Date: Mon Apr  8 09:42:26 2013
New Revision: 1465582

URL: http://svn.apache.org/r1465582
Log:
Modified cobertura ant tasks to reuse jars already available in OFBiz rather than downloading them again.

Modified:
    ofbiz/trunk/build.xml
    ofbiz/trunk/ivy.xml

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1465582&r1=1465581&r2=1465582&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Mon Apr  8 09:42:26 2013
@@ -86,8 +86,6 @@ under the License.
           description="Clean all downloaded files">
         <delete>
             <fileset dir="framework/base/lib" includes="cobertura-*.jar"/>
-            <fileset dir="framework/base/lib" includes="asm*.jar"/>
-            <fileset dir="framework/base/lib" includes="oro*.jar"/>
             <fileset dir="framework/base/lib" includes="sonar-*.jar"/>
             <fileset dir="framework/entity/lib/jdbc" includes="postgresql-*.jar"/>
         </delete>
@@ -1001,6 +999,7 @@ under the License.
                     <include name="cobertura-1.9.4.1.jar" />
                     <include name="log4j-1.2.17.jar" />
                     <include name="scripting/asm*.jar" />
+                    <include name="scripting/jakarta-oro-2.0.8.jar" />
                 </fileset>
             </classpath>
         </taskdef>
@@ -1027,8 +1026,9 @@ under the License.
             <classpath>
                 <fileset dir="framework/base/lib">
                     <include name="cobertura-1.9.4.1.jar" />
-                    <include name="log4j-1.2.16.jar" />
+                    <include name="log4j-1.2.17.jar" />
                     <include name="scripting/asm*.jar" />
+                    <include name="scripting/jakarta-oro-2.0.8.jar" />
                 </fileset>
             </classpath>
         </taskdef>

Modified: ofbiz/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/ivy.xml?rev=1465582&r1=1465581&r2=1465582&view=diff
==============================================================================
--- ofbiz/trunk/ivy.xml (original)
+++ ofbiz/trunk/ivy.xml Mon Apr  8 09:42:26 2013
@@ -40,6 +40,9 @@
         <!--Exclusions for cobertura-->
         <exclude module="log4j" conf="cobertura"/>
         <exclude module="ant" conf="cobertura"/>
+        <exclude module="asm" conf="cobertura"/>
+        <exclude module="asm-tree" conf="cobertura"/>
+        <exclude module="oro" conf="cobertura"/>
     </dependencies>
 
 </ivy-module>