You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/11/16 09:10:36 UTC
svn commit: r1202574 - in /geronimo/daytrader/branches/3.0-beta:
javaee6/modules/web/pom.xml pom.xml
Author: violalu
Date: Wed Nov 16 08:10:36 2011
New Revision: 1202574
URL: http://svn.apache.org/viewvc?rev=1202574&view=rev
Log:
remove snapshot and update myfaces package name
Modified:
geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/pom.xml
geronimo/daytrader/branches/3.0-beta/pom.xml
Modified: geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/pom.xml?rev=1202574&r1=1202573&r2=1202574&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/pom.xml Wed Nov 16 08:10:36 2011
@@ -16,11 +16,11 @@
<packaging>war</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>myfaces-bundle</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.daytrader.javaee6</groupId>
<artifactId>utils</artifactId>
@@ -67,11 +67,7 @@
<artifactId>geronimo-jsp_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-jstlel</artifactId>
- <scope>provided</scope>
- </dependency>
+
<!-- Removed per DAYTRADER-7 due to interop issues on commercial AppServers
<dependency>
Modified: geronimo/daytrader/branches/3.0-beta/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/pom.xml?rev=1202574&r1=1202573&r2=1202574&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/pom.xml Wed Nov 16 08:10:36 2011
@@ -43,6 +43,7 @@
<!-- set siteId to artifactId for any "top level" project rooting a website -->
<siteId>daytrader</siteId>
<openjpaVersion>2.1.0</openjpaVersion>
+ <myfacesVersion>2.0.9_1</myfacesVersion>
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
@@ -213,15 +214,43 @@
<!--JSF 1.2 JARs from Apache MyFaces -->
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>2.0.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>2.0.2</version>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>myfaces-bundle</artifactId>
+ <version>${myfacesVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -250,14 +279,8 @@
<version>${project.version}</version>
<type>war</type>
<scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-jstlel</artifactId>
- <version>1.2-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
+ </dependency>
+
</dependencies>
</dependencyManagement>