[jboss-cvs] JBossAS SVN: r64887 - trunk/build.

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

Author: dimitris at jboss.org
Date: 2007-08-27 07:17:45 -0400 (Mon, 27 Aug 2007)
New Revision: 64887

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
Log:
JBAS-4562

Library tidy up #1

a) Synch with AS 4.2.x
xdoclet to 1.2.3-brew (from 1.2b3) 
remoting to 2.2.1 for now and eventually to 2.2.2 when available (now at 2.2.0.SP4) 

b) Remove duplicate dom4j entry 1.6.1jboss, leave 1.6.1-brew

    <componentref name="dom4j" version="1.6.1-brew"/>
    <componentref name="dom4j" version="1.6.1jboss"/> 

c) Remove

- unused wutka-dtdparser
  (build/runtime time dependency of jbossxb needed for DTD-based marshalling which is not used in the AS.)
- backport-concurrent
- jbossretro 


Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-08-27 04:50:09 UTC (rev 64886)
+++ trunk/build/build-distr.xml	2007-08-27 11:17:45 UTC (rev 64887)
@@ -1763,10 +1763,7 @@
       <fileset dir="${jboss.cache.lib}">
         <include name="jbosscache.jar"/>
         <include name="pojocache.jar"/>
-      </fileset>
-      <fileset dir="${jboss.backport.concurrent.lib}">
-        <include name="jboss-backport-concurrent.jar"/>
-      </fileset>
+      </fileset>                                       
       <fileset dir="${jboss.jboss.security.spi.lib}">
         <include name="jboss-security-spi.jar"/>
       </fileset>

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2007-08-27 04:50:09 UTC (rev 64886)
+++ trunk/build/build-thirdparty.xml	2007-08-27 11:17:45 UTC (rev 64887)
@@ -71,7 +71,6 @@
     <componentref name="cglib" version="2.1.3-brew"/>
     <componentref name="commons-el" version="1.0"/>
     <componentref name="dom4j" version="1.6.1-brew"/>
-    <componentref name="dom4j" version="1.6.1jboss"/>
     <componentref name="easymock" version="1.1"/>
     <componentref name="ehcache" version="1.2.0.GA"/>
     <componentref name="gjt-jpl-util" version="1.0"/>
@@ -84,7 +83,6 @@
     <componentref name="javassist" version="3.6.0.CR1"/>
     <componentref name="jaxen" version="1.1-brew"/>
     <componentref name="jboss/aop" version="snapshot"/>
-    <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
     <componentref name="jboss/cache" version="2.0.0.GA"/>
     <componentref name="jboss/common-core" version="2.0.4.Alpha"/>
     <componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
@@ -94,7 +92,6 @@
     <componentref name="jboss/jaxr" version="1.2.0.GA"/>
     <componentref name="jboss/jboss-jaspi-api" version="1.0-SNAPSHOT"/>
     <componentref name="jboss/jboss-javaee" version="5.0.0-SNAPSHOT"/>
-    <componentref name="jboss/jbossretro" version="1.0.5.GA"/>
     <componentref name="jboss/jboss-security-spi" version="2.0.1-SNAPSHOT"/>
     <componentref name="jboss/jbosssx" version="2.0.1-SNAPSHOT"/>
     <componentref name="jboss/jbosssx-client" version="2.0.1-SNAPSHOT"/>    
@@ -107,7 +104,7 @@
     <componentref name="jboss/messaging" version="snapshot"/>
     <componentref name="jboss/microcontainer" version="snapshot"/>
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>    
-    <componentref name="jboss/remoting" version="2.2.0.SP4"/>
+    <componentref name="jboss/remoting" version="2.2.1.GA"/>
     <componentref name="jboss/serialization" version="1.0.3.GA"/>
     <componentref name="jboss/test" version="1.0.2.GA"/>
     <componentref name="jboss/web" version="2.0.1.CR6"/>
@@ -136,8 +133,7 @@
     <componentref name="sun-xacml" version="2.0"/>
     <componentref name="trove" version="1.0.2-brew"/>
     <componentref name="woodstox" version="3.1.1-brew"/>
-    <componentref name="wutka-dtdparser" version="1.2.1"/>
-    <componentref name="xdoclet" version="1.2b3"/>
+    <componentref name="xdoclet" version="1.2.3-brew"/>
     <componentref name="xmlunit-xmlunit" version="1.0"/>
     
   </build>