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

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

Author: jesper.pedersen
Date: 2010-05-11 07:47:46 -0400 (Tue, 11 May 2010)
New Revision: 104673

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/ivy.xml
Log:
[JBJCA-325] [JBJCA-326] Component updates

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2010-05-11 11:35:35 UTC (rev 104672)
+++ projects/jboss-jca/trunk/build.xml	2010-05-11 11:47:46 UTC (rev 104673)
@@ -76,7 +76,7 @@
        ================================= -->
   <property name="version.activation" value="1.1.1"/>
   <property name="version.ant" value="1.7.1"/>
-  <property name="version.apache-log4j" value="1.2.14"/>
+  <property name="version.apache-log4j" value="1.2.16"/>
   <property name="version.apache-logging" value="1.1.0.jboss"/>
   <property name="version.apache-xerces" value="2.9.1"/>
   <property name="version.apiviz" value="1.3.0.GA"/>
@@ -123,7 +123,7 @@
   <property name="version.slf4j" value="1.5.6"/>
   <property name="version.stax" value="1.0.1"/>
   <property name="version.transaction.api" value="1.0.1.GA"/>
-  <property name="version.trove" value="2.1.1"/>
+  <property name="version.trove" value="1.0.2"/>
   <property name="version.validation-api" value="1.0.0.GA"/>
 
   <!-- ================================= 

Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml	2010-05-11 11:35:35 UTC (rev 104672)
+++ projects/jboss-jca/trunk/ivy.xml	2010-05-11 11:47:46 UTC (rev 104673)
@@ -36,7 +36,6 @@
   </configurations>
 
   <dependencies>
-    <dependency org="apache-log4j" name="log4j" rev="${version.apache-log4j}" conf="standalone->default;sjc->*"/>
     <dependency org="apache-logging" name="commons-logging" rev="${version.apache-logging}" conf="*"/>
     <dependency org="com.github.fungal" name="fungal" rev="${version.fungal}" conf="standalone->default;sjc->*"/>
     <dependency org="com.github.fungal" name="fungal-cli" rev="${version.fungal}" conf="standalone->default;sjc->*"/>
@@ -49,9 +48,9 @@
     <dependency org="jboss.jbossts" name="jbossjts" rev="${version.jboss.ts}" conf="standalone->default;sjc->*"/>
     <dependency org="jboss.jbossts" name="jbossjts-integration" rev="${version.jboss.ts}" conf="standalone->default;sjc->*"/>
     <dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="standalone->default;sjc->*"/>
+    <dependency org="junit" name="junit" rev="${version.junit}" conf="test->default"/>
+    <dependency org="log4j" name="log4j" rev="${version.apache-log4j}" conf="standalone->default;sjc->*"/>
     <dependency org="org.apache.ant" name="ant" rev="${version.ant}" conf="standalone->default;sjc->*"/>
-    <dependency org="junit" name="junit" rev="${version.junit}" conf="test->default"/>
-    <dependency org="org.mockito" name="mockito-all" rev="${version.mockito}" conf="test->default"/>
     <dependency org="org.eclipse.jdt" name="core" rev="${version.eclipse-jdt}" conf="standalone->default;sjc->*"/>
     <dependency org="org.hibernate" name="hibernate-validator" rev="${version.hibernate-validator}" conf="standalone->default;sjc->*"/>
     <dependency org="org.jboss" name="jboss-common-core" rev="${version.jboss.common}" conf="standalone->default;sjc->*"/>
@@ -100,11 +99,12 @@
     <dependency org="org.jboss.stdio" name="jboss-stdio" rev="${version.jboss.stdio}" conf="standalone->default;sjc->*"/>
     <dependency org="org.jboss.threads" name="jboss-threads" rev="${version.jboss.threads}" conf="standalone->default;sjc->*"/>
     <dependency org="org.jboss.threads" name="jboss-threads-metadata" rev="${version.jboss.threads}" conf="standalone->default"/>
+    <dependency org="org.mockito" name="mockito-all" rev="${version.mockito}" conf="test->default"/>
     <dependency org="org.mortbay.jetty" name="jetty" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
     <dependency org="org.mortbay.jetty" name="jetty-util" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
-    <dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="${version.jetty.servlet}" conf="standalone->default;sjc->*"/>
     <dependency org="org.mortbay.jetty" name="jsp-2.1" rev="${version.jetty.servlet}" conf="standalone->default;sjc->*"/>
     <dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="${version.jetty.servlet}" conf="standalone->default;sjc->*"/>
+    <dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="${version.jetty.servlet}" conf="standalone->default;sjc->*"/>
     <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${version.slf4j}" conf="standalone->default;sjc->*"/>
     <dependency org="org.slf4j" name="slf4j-api" rev="${version.slf4j}" conf="standalone->default;sjc->*"/>
     <dependency org="stax" name="stax-api" rev="${version.stax}" conf="standalone->default;sjc->*"/>