[jboss-cvs] JBossAS SVN: r92201 - in branches/Branch_5_x: component-matrix and 1 other directories.

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

Author: stan.silvert at jboss.com
Date: 2009-08-10 12:54:08 -0400 (Mon, 10 Aug 2009)
New Revision: 92201

Modified:
   branches/Branch_5_x/build/build-distr.xml
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
JBAS-7167 build\build-distr.xml


Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml	2009-08-10 16:50:30 UTC (rev 92200)
+++ branches/Branch_5_x/build/build-distr.xml	2009-08-10 16:54:08 UTC (rev 92201)
@@ -1928,6 +1928,9 @@
       <fileset dir="${org.jboss.slf4j.lib}">
         <include name="slf4j-jboss-logging.jar"/>
       </fileset>
+      <fileset dir="${validation.api.lib}">
+        <include name="validation-api.jar"/>
+      </fileset>
     </copy>
 
     <!-- Copy the generated libraries -->

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-08-10 16:50:30 UTC (rev 92200)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-08-10 16:54:08 UTC (rev 92201)
@@ -33,6 +33,7 @@
     <version.apache.xalan>2.7.0.patch02-brew</version.apache.xalan>
     <version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
     <version.javax.faces>2.0.0-Beta2</version.javax.faces>
+    <version.javax.validation>1.0.CR3</version.javax.validation>
     <version.jboss.jaxr>2.0.0</version.jboss.jaxr>
     <version.jboss.jbossts>4.6.1.GA</version.jboss.jbossts>
     <version.jboss.jbossws-common>1.2.0.Beta2</version.jboss.jbossws-common>
@@ -48,7 +49,7 @@
     <version.org.hibernate.commons.annotations>3.1.0.GA</version.org.hibernate.commons.annotations>
     <version.org.hibernate.ejb3.persistence>1.0.2.GA</version.org.hibernate.ejb3.persistence>
     <version.org.hibernate.entity.manager>3.4.0.GA</version.org.hibernate.entity.manager>
-    <version.org.hibernate.validator>3.1.0.GA</version.org.hibernate.validator>
+    <version.org.hibernate.validator>4.0.0.Beta2</version.org.hibernate.validator>
     <version.org.hibernate>3.3.1.GA</version.org.hibernate>
     <version.org.jboss.aop>2.1.3.GA</version.org.jboss.aop>
     <version.org.jboss.aspects.currentinvocation>1.0.0.GA</version.org.jboss.aspects.currentinvocation>
@@ -370,6 +371,12 @@
       </dependency>
       
       <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>${version.javax.validation}</version>
+      </dependency>
+      
+      <dependency>
         <groupId>dom4j</groupId>
         <artifactId>dom4j</artifactId>
         <version>1.6.1</version>
@@ -1209,6 +1216,18 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate</artifactId>
           </exclusion>
+          <exclusion>
+             <groupId>javax.xml.bind</groupId>
+             <artifactId>jaxb-api</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>com.sun.xml.bind</groupId>
+             <artifactId>jaxb-impl</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>javax.xml.stream</groupId>
+             <artifactId>stax-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-08-10 16:50:30 UTC (rev 92200)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-08-10 16:54:08 UTC (rev 92201)
@@ -175,6 +175,13 @@
               </mapping>
             </dependency>
             <dependency>
+              <groupId>javax.validation</groupId>
+              <artifactId>validation-api</artifactId>
+              <mapping>
+                 <componentId>validation-api</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
               <groupId>jfree</groupId>
               <artifactId>jfreechart</artifactId>
               <mapping>
@@ -1283,6 +1290,10 @@
       <artifactId>hibernate-jbosscache2</artifactId>
     </dependency>
     <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
     </dependency>