[jboss-cvs] JBossAS SVN: r88705 - in branches/Branch_5_x: thirdparty and 1 other directory.

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

Author: wolfc
Date: 2009-05-12 02:49:41 -0400 (Tue, 12 May 2009)
New Revision: 88705

Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
JBAS-6904: ban org.hibernate:hibernate


Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-05-12 06:13:39 UTC (rev 88704)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-05-12 06:49:41 UTC (rev 88705)
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+  vi:ts=2:sw=2:expandtab
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -1693,6 +1695,19 @@
     
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
+        <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
+        <version>${version.org.jboss.ejb3.endpoint.deployer}</version>
+        <exclusions>
+          <!-- EJB3 artifacts come in via jboss-ejb3-as-int -->
+          <exclusion>
+            <groupId>org.jboss.ejb3</groupId>
+            <artifactId>jboss-ejb3-core</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      
+      <dependency>
+        <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-proxy-impl</artifactId>
         <version>${version.org.jboss.ejb3.proxy.impl.client}</version>
         <classifier>client</classifier>
@@ -1730,13 +1745,6 @@
       </dependency>
       
       <dependency>
-        <groupId>org.jboss.ejb3</groupId>
-        <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
-        <version>${version.org.jboss.ejb3.endpoint.deployer}</version>
-      </dependency>
-      
-      
-      <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-javaee</artifactId>
         <version>5.0.1${version.suffix.org.jboss.javaee}</version>
@@ -2185,6 +2193,8 @@
                         <exclude>xml-apis:xml-apis</exclude>
                         <exclude>com.sun.xml.fastinfoset:FastInfoset</exclude>
                         <exclude>sun-jaxws:FastInfoset</exclude>
+			<!-- JBAS-6904: use org.hibernate:hibernate-core -->
+			<exclude>org.hibernate:hibernate</exclude>
                         <exclude>org.jboss.jbossas:jboss-as-bootstrap</exclude> <!-- org.jboss.bootstrap:jboss-bootstrap JBAS-6171 -->
                       </excludes>
                     </bannedDependencies>

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-05-12 06:13:39 UTC (rev 88704)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-05-12 06:49:41 UTC (rev 88705)
@@ -1450,6 +1450,10 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-proxy-impl</artifactId>
       <classifier>client</classifier>
     </dependency>
@@ -1468,13 +1472,7 @@
       <artifactId>jboss-ejb3-security</artifactId>
       <classifier>client</classifier>
     </dependency>
-    <!-- jboss-ejb3-endpoint-deployer -->
     <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-client</artifactId>
     </dependency>