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

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

Author: smcgowan at redhat.com
Date: 2009-01-19 22:11:34 -0500 (Mon, 19 Jan 2009)
New Revision: 83096

Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
JBAS-6385, JBAS-6282, EJBTHREE-1690 - Upgrade jboss-javaee.jar to 5.0.1.GA

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-01-20 03:00:29 UTC (rev 83095)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-01-20 03:11:34 UTC (rev 83096)
@@ -1631,6 +1631,10 @@
             <groupId>org.jboss.microcontainer</groupId>
             <artifactId>jboss-deployers-core-spi</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.jboss.javaee</groupId>
+            <artifactId>jboss-servlet-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       
@@ -1668,6 +1672,10 @@
             <groupId>org.jboss.microcontainer</groupId>
             <artifactId>jboss-deployers-core-spi</artifactId>
           </exclusion>          
+          <exclusion>
+            <groupId>org.jboss.javaee</groupId>
+            <artifactId>jboss-servlet-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
     
@@ -1705,7 +1713,7 @@
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-javaee</artifactId>
-        <version>5.0.0${version.suffix.org.jboss.javaee}</version>
+        <version>5.0.1${version.suffix.org.jboss.javaee}</version>
       </dependency>
       
       <dependency>
@@ -1717,7 +1725,7 @@
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-jacc-api</artifactId>
-        <version>1.1.0${version.suffix.org.jboss.javaee}</version>
+        <version>1.1.0${version.suffix.org.jboss.javaee}_SP1</version>
       </dependency>
       
       <dependency>
@@ -1750,12 +1758,6 @@
         <version>1.0.1${version.suffix.org.jboss.javaee}</version>
       </dependency>
       
-      <dependency>
-        <groupId>org.jboss.javaee</groupId>
-        <artifactId>jboss-servlet-api</artifactId>
-        <version>2.5.0${version.suffix.org.jboss.javaee}</version>
-      </dependency>
-
       <!-- Normally comes in via EJB3, but we may need a patched one -->
       <dependency>
         <groupId>org.jboss.jpa</groupId>

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-01-20 03:00:29 UTC (rev 83095)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-01-20 03:11:34 UTC (rev 83096)
@@ -1428,10 +1428,6 @@
       <artifactId>jboss-transaction-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.javaee</groupId>
-      <artifactId>jboss-servlet-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-security-spi</artifactId>
     </dependency>