You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/11/22 05:16:54 UTC
svn commit: r719801 - in
/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources:
pom.xml src/main/webapp/WEB-INF/web.xml
Author: lu4242
Date: Fri Nov 21 20:16:53 2008
New Revision: 719801
URL: http://svn.apache.org/viewvc?rev=719801&view=rev
Log:
update archetype to latest myfaces versions
Modified:
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml?rev=719801&r1=719800&r2=719801&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml Fri Nov 21 20:16:53 2008
@@ -49,32 +49,33 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.2.4</version>
+ <version>1.2.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.2.4</version>
+ <version>1.2.5</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <!-- Temporal fix to avoid transitive dependency to shared -->
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.6</version>
+ <artifactId>tomahawk12</artifactId>
+ <version>1.1.8</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>jstl</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
<scope>runtime</scope>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=719801&r1=719800&r2=719801&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Fri Nov 21 20:16:53 2008
@@ -191,11 +191,6 @@
<url-pattern>/faces/*</url-pattern>
</filter-mapping>
- <!-- Listener, to allow Jetty serving MyFaces apps -->
- <listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>
-
<!-- Faces Servlet -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>