[jboss-cvs] JBossAS SVN: r107730 - in trunk: weld-int/assembly and 1 other directory.

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

Author: smcgowan at redhat.com
Date: 2010-08-21 13:01:39 -0400 (Sat, 21 Aug 2010)
New Revision: 107730

Modified:
   trunk/component-matrix/pom.xml
   trunk/weld-int/assembly/pom.xml
Log:
JBAS-8347 - Upgrade Hibernate to 3.5.5-Final, JBCTS-1042 patch

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-08-21 01:14:11 UTC (rev 107729)
+++ trunk/component-matrix/pom.xml	2010-08-21 17:01:39 UTC (rev 107730)
@@ -84,7 +84,7 @@
     <version.jsr181.api>1.0-MR1</version.jsr181.api>
     <version.junit>4.6</version.junit>
     <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
-    <version.org.hibernate>3.5.2-Final</version.org.hibernate>
+    <version.org.hibernate>3.5.5-Final</version.org.hibernate>
     <version.org.hibernate.commons.annotations>3.2.0.Final</version.org.hibernate.commons.annotations>
     <version.org.hibernate.entity.manager>${version.org.hibernate}</version.org.hibernate.entity.manager>
     <version.org.hibernate.javax.persistence>1.0.0.Final</version.org.hibernate.javax.persistence>
@@ -161,6 +161,7 @@
     <version.org.jboss.xnio.metadata>2.1.0.CR5</version.org.jboss.xnio.metadata>
     <version.org.osgi>4.2.0</version.org.osgi>
     <version.org.slf4j>1.5.6</version.org.slf4j>
+    <version.ch.qos.cal10n>0.7.2</version.ch.qos.cal10n>
     <version.org.springframework>3.0.1.RELEASE</version.org.springframework>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
     <version.seam.integration>6.0.0.Alpha1</version.seam.integration>
@@ -1683,6 +1684,12 @@
       </dependency>
       
       <dependency>
+        <groupId>ch.qos.cal10n</groupId>
+        <artifactId>cal10n-api</artifactId>
+        <version>${version.ch.qos.cal10n}</version>
+      </dependency>
+      
+      <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
         <version>${version.org.slf4j}</version>

Modified: trunk/weld-int/assembly/pom.xml
===================================================================
--- trunk/weld-int/assembly/pom.xml	2010-08-21 01:14:11 UTC (rev 107729)
+++ trunk/weld-int/assembly/pom.xml	2010-08-21 17:01:39 UTC (rev 107730)
@@ -161,8 +161,14 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
+      <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>ch.qos.cal10n</groupId>
+      <artifactId>cal10n-api</artifactId>
+      <optional>true</optional>
+    </dependency>
 
    </dependencies>