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

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

Author: jesper.pedersen
Date: 2009-06-26 10:15:58 -0400 (Fri, 26 Jun 2009)
New Revision: 90633

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/ivy.xml
Log:
clean up metadata definitions

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2009-06-26 14:14:38 UTC (rev 90632)
+++ projects/jboss-jca/trunk/build.xml	2009-06-26 14:15:58 UTC (rev 90633)
@@ -87,11 +87,7 @@
   <property name="version.jboss.mc.dependency" value="2.2.0.M1"/>
   <property name="version.jboss.mc.kernel" value="2.2.0.M1"/>
   <property name="version.jboss.mdr" value="2.0.1.GA"/>
-<!--
-  <property name="version.jboss.metadata" value="1.0.2.Beta1"/>
--->
-  <property name="version.jboss.metadata.common" value="2.0.0-SNAPSHOT"/>
-  <property name="version.jboss.metadata.rar" value="2.0.0-SNAPSHOT"/>
+  <property name="version.jboss.metadata" value="2.0.0-SNAPSHOT"/>
   <property name="version.jboss.naming" value="5.0.3.GA"/>
   <property name="version.jboss.reflect" value="2.0.2.GA"/>
   <property name="version.jboss.ts" value="4.6.1.GA"/>

Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml	2009-06-26 14:14:38 UTC (rev 90632)
+++ projects/jboss-jca/trunk/ivy.xml	2009-06-26 14:15:58 UTC (rev 90633)
@@ -82,11 +82,8 @@
     <dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="standalone->default;sjc->*"/>
     <dependency org="org.jboss.man" name="jboss-managed" rev="${version.jboss.managed}" conf="standalone->default"/>
     <dependency org="org.jboss.man" name="jboss-metatype" rev="${version.jboss.managed}" conf="standalone->default"/>
-<!--
-    <dependency org="org.jboss.metadata" name="jboss-metadata" rev="${version.jboss.metadata}" conf="standalone->default;sjc->*"/>
--->
-    <dependency org="org.jboss.metadata" name="metadata-common" rev="${version.jboss.metadata.common}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.jboss.metadata" name="metadata-rar" rev="${version.jboss.metadata.rar}" conf="standalone->default;sjc->*"/>
+    <dependency org="org.jboss.metadata" name="metadata-common" rev="${version.jboss.metadata}" conf="standalone->default;sjc->*"/>
+    <dependency org="org.jboss.metadata" name="metadata-rar" rev="${version.jboss.metadata}" conf="standalone->default;sjc->*"/>
 
     <dependency org="org.jboss.microcontainer" name="jboss-aop-mc-int" rev="${version.jboss.mc.aop-int}" conf="standalone->default"/>
     <dependency org="org.jboss.microcontainer" name="jboss-dependency" rev="${version.jboss.mc.dependency}" conf="standalone->default"/>