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:19:07 UTC

svn commit: r719804 - /myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml

Author: lu4242
Date: Fri Nov 21 20:19:07 2008
New Revision: 719804

URL: http://svn.apache.org/viewvc?rev=719804&view=rev
Log:
update archetype to latest myfaces versions

Modified:
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml?rev=719804&r1=719803&r2=719804&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml Fri Nov 21 20:19:07 2008
@@ -76,6 +76,13 @@
       <artifactId>myfaces-impl</artifactId>
       <version>${myfaces.version}</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>
 
     <!-- Apache Trinidad -->
@@ -93,7 +100,7 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-    	<groupId>jstl</groupId>
+    	<groupId>javax.servlet</groupId>
     	<artifactId>jstl</artifactId>
     	<version>1.2</version>
     	<scope>runtime</scope>
@@ -108,8 +115,8 @@
   </dependencies>
 
   <properties>
-    <trinidad.version>1.2.5</trinidad.version>
-    <myfaces.version>1.2.4</myfaces.version>
+    <trinidad.version>1.2.10</trinidad.version>
+    <myfaces.version>1.2.5</myfaces.version>
   </properties>
 
 </project>