[jboss-cvs] JBossAS SVN: r60848 - branches/Branch_4_2/build.

[jboss-cvs-commits at lists.jboss.org]

Author: vivekl at redhat.com
Date: 2007-02-23 13:07:25 -0500 (Fri, 23 Feb 2007)
New Revision: 60848

Modified:
   branches/Branch_4_2/build/build-distr.xml
   branches/Branch_4_2/build/build-thirdparty.xml
Log:
- Address the following JIRA tasks:
  JBAS-4132
  JBAS-4137
  JBAS-4141
- Switch to brew built thirdparty dependencies
- Modify build-distr.xml to use separate component name for
  snmptrapappender (imported by log4j)



Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml	2007-02-23 18:02:16 UTC (rev 60847)
+++ branches/Branch_4_2/build/build-distr.xml	2007-02-23 18:07:25 UTC (rev 60848)
@@ -115,7 +115,7 @@
         <include name="log4j.jar"/>
       </fileset>
     </copy>
-    <copy file="${apache.log4j.lib}/snmpTrapAppender.jar"
+    <copy file="${snmptrapappender.snmptrapappender.lib}/snmpTrapAppender.jar"
         tofile="${install.all.lib}/log4j-snmp-appender.jar">
     </copy>
 

Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml	2007-02-23 18:02:16 UTC (rev 60847)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2007-02-23 18:07:25 UTC (rev 60848)
@@ -46,40 +46,40 @@
     are pushed to the http://repository.jboss.com site.
     -->
 
-    <componentref name="antlr" version="2.7.6.ga"/>
-    <componentref name="apache-avalon" version="4.1.5"/>
-    <componentref name="apache-avalon-logkit" version="1.2"/>
-    <componentref name="apache-bcel" version="5.1"/>
-    <componentref name="apache-beanutils" version="1.7.0"/>
-    <componentref name="apache-bsf" version="2.3.0"/>
-    <componentref name="apache-codec" version="1.3.0"/>
-    <componentref name="apache-collections" version="3.1"/>
-    <componentref name="apache-digester" version="1.7brew"/>
-    <componentref name="apache-discovery" version="0.2"/>
-    <componentref name="apache-fileupload" version="1.0"/>
-    <componentref name="apache-httpclient" version="3.0.1"/>
+    <componentref name="antlr" version="2.7.6-brew"/>
+    <componentref name="apache-avalon" version="4.1.5-brew"/>
+    <componentref name="apache-avalon-logkit" version="1.2-brew"/>
+    <componentref name="apache-bcel" version="5.1-brew"/>
+    <componentref name="apache-beanutils" version="1.7.0-brew"/>
+    <componentref name="apache-bsf" version="2.3.0-brew"/>
+    <componentref name="apache-codec" version="1.3.0-brew"/>
+    <componentref name="apache-collections" version="3.1-brew"/>
+    <componentref name="apache-digester" version="1.7-brew"/>
+    <componentref name="apache-discovery" version="0.4-brew"/>
+    <componentref name="apache-fileupload" version="1.1.1-brew"/>
+    <componentref name="apache-httpclient" version="3.0.1-brew"/>
     <componentref name="apache-jaxme" version="0.2-cvs"/>
-    <componentref name="apache-log4j" version="1.2.14"/>
+    <componentref name="apache-log4j" version="1.2.14-brew"/>
     <componentref name="apache-logging" version="1.1.0.jboss"/>
     <componentref name="apache-scout" version="0.7rc2"/>
-    <componentref name="apache-slide" version="1.0.16"/>
+    <componentref name="apache-slide" version="2.1-brew"/>
     <componentref name="apache-velocity" version="1.4jboss"/>
-    <componentref name="apache-xalan" version="j_2.7.0"/>
+    <componentref name="apache-xalan" version="j_2.7.0-brew"/>
     <componentref name="apache-xerces" version="2.7.1"/>
-    <componentref name="apache-xmlsec" version="1.3.0"/>
-    <componentref name="cglib" version="2.1.3.nodep"/>
-    <componentref name="beanshell" version="1.3.0"/>
-    <componentref name="dom4j" version="1.6.1"/>
+    <componentref name="apache-xmlsec" version="1.3.0-brew"/>
+    <componentref name="cglib" version="2.1.3-brew"/>
+    <componentref name="beanshell" version="1.3.0-brew"/>
+    <componentref name="dom4j" version="1.6.1-brew"/>
     <componentref name="gjt-jpl-util" version="1.0"/>
-    <componentref name="gnu-getopt" version="1.0.10"/>
+    <componentref name="gnu-getopt" version="1.0.12-brew"/>
     <componentref name="hibernate" version="3.2.1.GA"/>
     <componentref name="hibernate-annotations" version="3.2.1.GA"/>
     <componentref name="hibernate-entitymanager" version="3.2.1.GA"/>
-    <componentref name="hsqldb" version="1.8.0.2"/>
+    <componentref name="hsqldb" version="1.8.0.7-brew"/>
     <componentref name="ibm-wsdl4j" version="1.5.2jboss"/>
     <componentref name="jacorb" version="2.2.4jboss.patch1"/>
-    <componentref name="javassist" version="3.5.0.CR1"/>
-    <componentref name="jaxen" version="1.1-beta-9"/>
+    <componentref name="javassist" version="3.5.0.CR1-brew"/>
+    <componentref name="jaxen" version="1.1-brew"/>
     <componentref name="jboss/aop" version="1.5.4.SP2"/>
     <componentref name="jboss/cache" version="1.4.1.SP2"/>
     <componentref name="jboss/common" version="1.0.4.GA"/>
@@ -96,15 +96,15 @@
     <componentref name="jboss/jboss-vfs" version="1.0.0.Beta"/>
     <componentref name="jboss/web" version="2.0.0.CR1"/>
     <componentref name="jfreechart" version="0.9.20"/>
-    <componentref name="jgroups" version="2.4.1"/>
-    <componentref name="joesnmp" version="0.3.4"/>
-    <componentref name="juddi" version="0.9RC4"/>
-    <componentref name="junit" version="3.8.1"/>
+    <componentref name="jgroups" version="2.4.1-brew"/>
+    <componentref name="joesnmp" version="0.3.4-brew"/>
+    <componentref name="juddi" version="0.9RC4-brew"/>
+    <componentref name="junit" version="3.8.2-brew"/>
     <componentref name="junitejb" version="1.4"/>
     <componentref name="objectweb-joramtests" version="1.1"/>
-    <componentref name="odmg" version="3.0"/>
-    <componentref name="oswego-concurrent" version="1.3.4"/>
-    <componentref name="quartz" version="1.5.2"/>
+    <componentref name="odmg" version="3.0-brew"/>
+    <componentref name="oswego-concurrent" version="1.3.4-brew"/>
+    <componentref name="quartz" version="1.5.2-brew"/>
     <componentref name="qdox" version="1.4"/>
     <componentref name="stax-api" version="1.0"/>
     <componentref name="sun-jaf" version="1.1"/>
@@ -114,7 +114,7 @@
     <componentref name="sun-jsf" version="1.2_03"/>
     <componentref name="sun-jstl" version="1.2"/>
     <componentref name="sun-servlet" version="2.5"/>
-    <componentref name="trove" version="1.0.2"/>
+    <componentref name="trove" version="1.0.2-brew"/>
     <componentref name="woodstox" version="3.1.1"/>
     <componentref name="xdoclet" version="1.2b3"/>