[jboss-cvs] JBossAS SVN: r112238 - projects/jboss-jca/trunk.

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

Author: jesper.pedersen
Date: 2011-09-14 10:51:57 -0400 (Wed, 14 Sep 2011)
New Revision: 112238

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/ivy.xml
Log:
[JBJCA-673] [JBJCA-674] Arquillian and Descriptors upgrade

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2011-09-14 13:48:27 UTC (rev 112237)
+++ projects/jboss-jca/trunk/build.xml	2011-09-14 14:51:57 UTC (rev 112238)
@@ -110,7 +110,7 @@
   <property name="version.apache-log4j" value="1.2.16"/>
   <property name="version.apache-logging" value="1.1.0.jboss"/>
   <property name="version.apiviz" value="1.3.1.GA"/>
-  <property name="version.arquillian" value="1.0.0.CR4"/>
+  <property name="version.arquillian" value="1.0.0.CR5"/>
   <property name="version.dom4j" value="1.6.1"/>
   <property name="version.mockito" value="1.8.5"/>
   <property name="version.eclipse.ecj" value="3.5.1"/>
@@ -133,7 +133,7 @@
   <property name="version.jboss.picketbox" value="4.0.1"/>
   <property name="version.jboss.security" value="2.1.0.20090318"/>
   <property name="version.jboss.shrinkwrap" value="1.0.0-beta-5"/>
-  <property name="version.jboss.shrinkwrap.descriptors" value="1.1.0-alpha-2"/>
+  <property name="version.jboss.shrinkwrap.descriptors" value="1.2.0-alpha-1"/>
   <property name="version.jboss.slf4j" value="1.0.2.GA"/>
   <property name="version.jboss.slf4j.logmanager" value="1.0.0.GA"/>
   <property name="version.jboss.stdio" value="1.0.0.GA"/>

Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml	2011-09-14 13:48:27 UTC (rev 112237)
+++ projects/jboss-jca/trunk/ivy.xml	2011-09-14 14:51:57 UTC (rev 112238)
@@ -169,8 +169,10 @@
     <dependency org="org.jboss.netty" name="netty" rev="${version.jboss.netty}" conf="hornetq,ironjacamar-depchain"/>
     <dependency org="org.jboss.papaki" name="papaki-core" rev="${version.jboss.papaki}" conf="common,ironjacamar-common-impl-papaki,ironjacamar-depchain"/>
     <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-api" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain,ironjacamar-embedded,ironjacamar-embedded-arquillian"/>
-    <dependency org="org.jboss.shrinkwrap.descriptors" name="shrinkwrap-descriptors-api" rev="${version.jboss.shrinkwrap.descriptors}" conf="embedded,ironjacamar-depchain"/>
-    <dependency org="org.jboss.shrinkwrap.descriptors" name="shrinkwrap-descriptors-impl" rev="${version.jboss.shrinkwrap.descriptors}" conf="embedded,ironjacamar-depchain"/>
+    <dependency org="org.jboss.shrinkwrap.descriptors" name="shrinkwrap-descriptors-api-base" rev="${version.jboss.shrinkwrap.descriptors}" conf="embedded,ironjacamar-depchain"/>
+    <dependency org="org.jboss.shrinkwrap.descriptors" name="shrinkwrap-descriptors-api-javaee" rev="${version.jboss.shrinkwrap.descriptors}" conf="embedded,ironjacamar-depchain"/>
+    <dependency org="org.jboss.shrinkwrap.descriptors" name="shrinkwrap-descriptors-impl-base" rev="${version.jboss.shrinkwrap.descriptors}" conf="embedded,ironjacamar-depchain"/>
+    <dependency org="org.jboss.shrinkwrap.descriptors" name="shrinkwrap-descriptors-impl-javaee" rev="${version.jboss.shrinkwrap.descriptors}" conf="embedded,ironjacamar-depchain"/>
     <dependency org="org.jboss.shrinkwrap.descriptors" name="shrinkwrap-descriptors-spi" rev="${version.jboss.shrinkwrap.descriptors}" conf="embedded,ironjacamar-depchain"/>
     <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-impl-base" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain"/>
     <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-spi" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain"/>