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

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

Author: jesper.pedersen
Date: 2010-08-25 11:18:37 -0400 (Wed, 25 Aug 2010)
New Revision: 107779

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/ivy.xml
Log:
[JBJCA-406] [JBJCA-407] [JBJCA-408] [JBJCA-409] Logging updates

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2010-08-25 15:14:12 UTC (rev 107778)
+++ projects/jboss-jca/trunk/build.xml	2010-08-25 15:18:37 UTC (rev 107779)
@@ -105,10 +105,8 @@
   <property name="version.jboss.common" value="2.2.17.GA"/>
   <property name="version.jboss.integration" value="5.1.0.CR1"/>
   <property name="version.jboss.jaspi.api" value="1.0.0.GA"/>
-  <property name="version.jboss.logging" value="2.2.0.CR1"/>
-  <property name="version.jboss.logging.metadata" value="1.0.0.CR4"/>
-  <property name="version.jboss.logmanager" value="1.1.1.GA"/>
-  <property name="version.jboss.logmanager.log4j" value="1.0.0.CR2"/>
+  <property name="version.jboss.logging" value="3.0.0.Beta3"/>
+  <property name="version.jboss.logmanager" value="1.2.0.CR6"/>
   <property name="version.jboss.naming" value="5.0.3.GA"/>
   <property name="version.jboss.papaki" value="1.0.0.Beta3"/>
   <property name="version.jboss.picketbox" value="3.0.0.Beta6"/>
@@ -117,7 +115,7 @@
   <property name="version.jboss.security" value="2.1.0.20090318"/>
   <property name="version.jboss.shrinkwrap" value="1.0.0-alpha-11"/>
   <property name="version.jboss.slf4j" value="1.0.2.GA"/>
-  <property name="version.jboss.slf4j.logmanager" value="1.0.0.CR2"/>
+  <property name="version.jboss.slf4j.logmanager" value="1.0.0.CR3"/>
   <property name="version.jboss.stdio" value="1.0.0.CR3"/>
   <property name="version.jboss.threads" value="2.0.0.CR3"/>
   <property name="version.jboss.ts" value="4.11.0.Final"/>
@@ -129,7 +127,7 @@
   <property name="version.jasper" value="glassfish_2.1.0.v201004190952"/>
   <property name="version.junit" value="4.8.1"/>
   <property name="version.maven" value="2.2.1"/>
-  <property name="version.slf4j" value="1.5.6"/>
+  <property name="version.slf4j" value="1.5.8"/>
   <property name="version.stax" value="1.0.1"/>
   <property name="version.transaction.api" value="1.0.1.GA"/>
   <property name="version.validation-api" value="1.0.0.GA"/>

Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml	2010-08-25 15:14:12 UTC (rev 107778)
+++ projects/jboss-jca/trunk/ivy.xml	2010-08-25 15:18:37 UTC (rev 107779)
@@ -125,20 +125,14 @@
     <dependency org="org.jboss.javaee" name="jboss-transaction-api" rev="${version.transaction.api}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,ironjacamar-spec-api"/>
     <dependency org="org.jboss.jbossts" name="jbossjts" rev="${version.jboss.ts}" conf="common,ironjacamar-depchain"/>
     <dependency org="org.jboss.jbossts" name="jbossjts-integration" rev="${version.jboss.ts}" conf="common,ironjacamar-depchain"/>
-    <dependency org="org.jboss.logging" name="jboss-logging-jdk" rev="${version.jboss.logging}" conf="common,ironjacamar-depchain"/>
-    <dependency org="org.jboss.logging" name="jboss-logging-log4j" rev="${version.jboss.logging}" conf="common,ironjacamar-depchain"/>
-    <dependency org="org.jboss.logging" name="jboss-logging-logmanager" rev="${version.jboss.logging}" conf="common,ironjacamar-depchain"/>
-    <dependency org="org.jboss.logging" name="jboss-logging-spi" rev="${version.jboss.logging}" conf="common,ironjacamar-common-impl,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal"/>
-    <dependency org="org.jboss.logging" name="logging-service-metadata" rev="${version.jboss.logging.metadata}" conf="common,ironjacamar-depchain"/>
+    <dependency org="org.jboss.logging" name="jboss-logging" rev="${version.jboss.logging}" conf="common,ironjacamar-depchain"/>
     <dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="common,ironjacamar-depchain"/>
-    <dependency org="org.jboss.logmanager" name="jboss-logmanager-log4j" rev="${version.jboss.logmanager.log4j}" conf="common,ironjacamar-depchain"/>
     <dependency org="org.jboss.naming" name="jnpserver" rev="${version.jboss.naming}" conf="common,ironjacamar-depchain"/>
     <dependency org="org.jboss.papaki" name="papaki-core" rev="${version.jboss.papaki}" conf="common,ironjacamar-common-impl,ironjacamar-depchain"/>
     <dependency org="org.jboss.security" name="jboss-security-spi-bare" rev="${version.jboss.security}" conf="common,ironjacamar-core-impl,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" 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"/>
-    <dependency org="org.jboss.slf4j" name="slf4j-jboss-logging" rev="${version.jboss.slf4j}" conf="common,ironjacamar-depchain"/>
     <dependency org="org.jboss.slf4j" name="slf4j-jboss-logmanager" rev="${version.jboss.slf4j.logmanager}" conf="common,ironjacamar-depchain"/>
     <dependency org="org.jboss.stdio" name="jboss-stdio" rev="${version.jboss.stdio}" conf="common,ironjacamar-depchain"/>
     <dependency org="org.jboss.threads" name="jboss-threads" rev="${version.jboss.threads}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain"/>