[jboss-svn-commits] JBL Code SVN: r38281 - in labs/jbossesb/trunk/product: services/soap and 1 other directory.

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

Author: tcunning
Date: 2013-02-24 23:43:27 -0500 (Sun, 24 Feb 2013)
New Revision: 38281

Modified:
   labs/jbossesb/trunk/product/ivy.xml
   labs/jbossesb/trunk/product/services/soap/build.xml
Log:
JBESB-3904
Use jaxb-api-2.1.9-brew and exclude jboss-aop-2.1.1.GA from the aopc compiler classpath.


Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml	2013-02-13 14:45:33 UTC (rev 38280)
+++ labs/jbossesb/trunk/product/ivy.xml	2013-02-25 04:43:27 UTC (rev 38281)
@@ -36,7 +36,7 @@
         <dependency org="org.jboss.cache" name="jbosscache-core" rev="3.2.7.GA"/>
         <dependency org="jgroups" name="jgroups" rev="2.6.15.GA"/>
 
-        <dependency org="javassist" name="javassist" rev="3.6.0.GA"/>
+        <dependency org="javassist" name="javassist" rev="3.12.1.GA"/>
 
         <dependency org="org.apache.ws.scout" name="jaxr-api" rev="1.0"/>
         <dependency org="org.apache.juddi.scout" name="scout" rev="1.2.6"/>
@@ -133,7 +133,6 @@
         <dependency org="org.jboss"	name="jboss-reflect" rev="2.0.2.GA"/>
         <dependency org="org.jboss"	name="jbossxb" rev="2.0.1.GA"/>
 
-
 		<!-- Note that jboss-metadata is still in beta -->
         <!--dependency org="org.jboss"	name="jboss-metadata" rev="1.0.1.GA"/-->
         <dependency org="org.jboss"	name="jboss-metadata" rev="1.0.0.Beta6"/>
@@ -158,7 +157,7 @@
         <dependency org="org.jboss.javaee" name="jboss-ejb-api" rev="3.0.0.GA"/>
         <dependency org="org.jboss.test" name="jboss-test" rev="1.1.4.GA"/>
 
-        <dependency org="javax.xml.bind" name="jaxb-api" rev="2.1">
+        <dependency org="sun-jaxb" name="jaxb-api" rev="2.1.9-brew">
         	<exclude org="javax.xml.stream" module="stax-api"/>
         	<exclude org="stax" module="stax-api"/>
         </dependency>

Modified: labs/jbossesb/trunk/product/services/soap/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soap/build.xml	2013-02-13 14:45:33 UTC (rev 38280)
+++ labs/jbossesb/trunk/product/services/soap/build.xml	2013-02-25 04:43:27 UTC (rev 38281)
@@ -77,6 +77,8 @@
             <fileset dir="../../build/lib">
 	     <include name="**.jar"/>
 	     <exclude name="ant**"/>
+	     <exclude name="jboss-aop-2.1.1.GA.jar"/>
+	     <exclude name="jboss-aop-mc-int-2.0.6.GA.jar"/>
             </fileset>
             <!-- Adding the Smooks jars... -->
             <fileset dir="../smooks/lib/ext" includes="*.jar"/>