You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/03/24 20:16:42 UTC
svn commit: r927160 - in /myfaces/core/trunk: api/pom.xml pom.xml

Author: jakobk
Date: Wed Mar 24 19:16:41 2010
New Revision: 927160

URL: http://svn.apache.org/viewvc?rev=927160&view=rev
Log:
MYFACES-2623 validation-api and el-api 2.2 should be optional dependencies with scope compile in myfaces-api

Modified:
    myfaces/core/trunk/api/pom.xml
    myfaces/core/trunk/pom.xml

Modified: myfaces/core/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/pom.xml?rev=927160&r1=927159&r2=927160&view=diff
==============================================================================
--- myfaces/core/trunk/api/pom.xml (original)
+++ myfaces/core/trunk/api/pom.xml Wed Mar 24 19:16:41 2010
@@ -357,6 +357,12 @@
        </dependency> -->
 
         <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>el-api</artifactId>
+            <version>2.2</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
             <groupId>de.berlios.jsunit</groupId>
             <artifactId>jsunit-maven2-plugin</artifactId>
             <version>1.3</version>
@@ -443,13 +449,7 @@
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>el-api</artifactId>
-            <scope>provided</scope>
+            <version>1.0.CR3</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

Modified: myfaces/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/pom.xml?rev=927160&r1=927159&r2=927160&view=diff
==============================================================================
--- myfaces/core/trunk/pom.xml (original)
+++ myfaces/core/trunk/pom.xml Wed Mar 24 19:16:41 2010
@@ -175,18 +175,6 @@
         <artifactId>geronimo-annotation_1.0_spec</artifactId>
         <version>1.0</version>
       </dependency>
-      <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>1.0.CR3</version>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>javax.el</groupId>
-        <artifactId>el-api</artifactId>
-        <version>2.1.2-b05</version>
-        <optional>true</optional>
-      </dependency>
     </dependencies>
   </dependencyManagement>