[jboss-cvs] JBossAS SVN: r111650 - in trunk: testsuite and 1 other directories.

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

Author: pgier
Date: 2011-06-21 17:48:47 -0400 (Tue, 21 Jun 2011)
New Revision: 111650

Modified:
   trunk/component-matrix/pom.xml
   trunk/testsuite/pom.xml
   trunk/tomcat/pom.xml
Log:
[JBAS-9409] Switch to use JBoss JSTL Spec API jar

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2011-06-21 20:59:27 UTC (rev 111649)
+++ trunk/component-matrix/pom.xml	2011-06-21 21:48:47 UTC (rev 111650)
@@ -3700,6 +3700,12 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      
+      <dependency>
+        <groupId>org.jboss.spec.javax.servlet.jstl</groupId>
+        <artifactId>jboss-jstl-api_1.2_spec</artifactId>
+        <version>1.0.1.Final</version>
+      </dependency>
 
       <dependency>
         <groupId>org.springframework</groupId>
@@ -4050,6 +4056,7 @@
                         <exclude>javax.el:el-api</exclude>
                         <exclude>javax.transaction:jta</exclude>
                         <exclude>javax.security:jacc</exclude>
+                        <exclude>javax.servlet.jstl</exclude>
                         <exclude>bsh:bsh</exclude>
                         <exclude>bsf:bsf</exclude>
                         <exclude>javax.xml.stream:stax-api</exclude>

Modified: trunk/testsuite/pom.xml
===================================================================
--- trunk/testsuite/pom.xml	2011-06-21 20:59:27 UTC (rev 111649)
+++ trunk/testsuite/pom.xml	2011-06-21 21:48:47 UTC (rev 111650)
@@ -85,10 +85,6 @@
       <artifactId>jacorb_g</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>com.sun.faces</groupId>
       <artifactId>jsf-api</artifactId>
     </dependency>

Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml	2011-06-21 20:59:27 UTC (rev 111649)
+++ trunk/tomcat/pom.xml	2011-06-21 21:48:47 UTC (rev 111650)
@@ -116,7 +116,7 @@
                   tofile="${output.deploy}/jbossweb.sar/jasper-jdt.jar"/>
                 <copy file="${maven.dependency.org.jboss.web.jbossweb.jar.path}"
                   tofile="${output.deploy}/jbossweb.sar/jbossweb.jar"/>
-                <copy file="${maven.dependency.javax.servlet.jstl.jar.path}"
+                <copy file="${maven.dependency.org.jboss.spec.javax.servlet.jstl.jboss-jstl-api_1.2_spec.jar.path}"
                   tofile="${output.deploy}/jbossweb.sar/jstl.jar"/>                                                    
             
                 <copy file="target/${project.build.finalName}-jboss-web-service.jar"
@@ -171,8 +171,8 @@
       <artifactId>xml-apis</artifactId>
     </dependency>    
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
+      <groupId>org.jboss.spec.javax.servlet.jstl</groupId>
+      <artifactId>jboss-jstl-api_1.2_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>jacorb</groupId>