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/28 18:36:26 UTC
svn commit: r928446 - in /myfaces/core/trunk: api/pom.xml impl/pom.xml
Author: jakobk
Date: Sun Mar 28 16:36:25 2010
New Revision: 928446
URL: http://svn.apache.org/viewvc?rev=928446&view=rev
Log:
MYFACES-2623 validation-api and el-api 2.2 should be optional dependencies with scope compile in myfaces-api (applied changes also to myfaces-impl + added a comment about the ordering of el-api in myfaces-api)
Modified:
myfaces/core/trunk/api/pom.xml
myfaces/core/trunk/impl/pom.xml
Modified: myfaces/core/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/pom.xml?rev=928446&r1=928445&r2=928446&view=diff
==============================================================================
--- myfaces/core/trunk/api/pom.xml (original)
+++ myfaces/core/trunk/api/pom.xml Sun Mar 28 16:36:25 2010
@@ -357,6 +357,7 @@
</dependency> -->
<dependency>
+ <!-- el-api 2.1 is included in jsp-api, so this one has to be on top of it -->
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>2.2</version>
Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/pom.xml?rev=928446&r1=928445&r2=928446&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Sun Mar 28 16:36:25 2010
@@ -826,6 +826,13 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <!-- el-api 2.1 is included in jsp-api, so this one has to be on top of it -->
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<!-- version defined in parent -->
@@ -910,12 +917,12 @@
<version>1.0.4</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>1.0.CR3</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.0.CR3</version>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>