MYFACES-3099 Update archetype versions
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
index c0efd6d..4c0a549 100644
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
+++ b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
<url>http://www.myorganization.org</url>
<properties>
- <jsf-myfaces.version>1.2.9</jsf-myfaces.version>
+ <jsf-myfaces.version>1.2.10</jsf-myfaces.version>
<jsf-ri.version>1.2_15</jsf-ri.version>
<maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
<log4j.version>1.2.13</log4j.version>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
index dc57a5a..38152ad 100644
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
+++ b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
<url>http://www.myorganization.org</url>
<properties>
- <jsf-myfaces.version>1.2.9</jsf-myfaces.version>
+ <jsf-myfaces.version>1.2.10</jsf-myfaces.version>
<jsf-ri.version>1.2_15</jsf-ri.version>
<maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
<log4j.version>1.2.13</log4j.version>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
index 20c4c6c..4b47fae 100644
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
+++ b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
<url>http://www.myorganization.org</url>
<properties>
- <jsf-myfaces.version>1.2.9</jsf-myfaces.version>
+ <jsf-myfaces.version>1.2.10</jsf-myfaces.version>
<jsf-ri.version>1.2_15</jsf-ri.version>
<maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
<log4j.version>1.2.13</log4j.version>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml
index 5d7ca14..3c61a32 100644
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml
+++ b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml
@@ -32,9 +32,9 @@
<url>http://www.myorganization.org</url>
<properties>
- <jsf-myfaces.version>2.0.2</jsf-myfaces.version>
- <jsf-mojarra.version>2.0.3</jsf-mojarra.version>
- <openwebbeans.version>1.0.0</openwebbeans.version>
+ <jsf-myfaces.version>2.0.4</jsf-myfaces.version>
+ <jsf-mojarra.version>2.0.5-b02</jsf-mojarra.version>
+ <openwebbeans.version>1.1.0</openwebbeans.version>
<maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
</properties>
@@ -192,16 +192,23 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ <version>1.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/pom.xml
index 4975190..47af520 100644
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/pom.xml
+++ b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/pom.xml
@@ -34,8 +34,8 @@
<url>http://www.myorganization.org</url>
<properties>
- <jsf-myfaces.version>2.0.2</jsf-myfaces.version>
- <jsf-mojarra.version>2.0.3</jsf-mojarra.version>
+ <jsf-myfaces.version>2.0.4</jsf-myfaces.version>
+ <jsf-mojarra.version>2.0.5-b02</jsf-mojarra.version>
<maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
</properties>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml
index ad2de09..60c3f91 100644
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml
+++ b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.2.9</version>
+ <version>1.2.10</version>
<scope>provided</scope>
</dependency>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
index cc3343a..b369a8f 100644
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
+++ b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
@@ -37,7 +37,7 @@
</parent>
<properties>
- <jsf-myfaces.version>1.2.9</jsf-myfaces.version>
+ <jsf-myfaces.version>1.2.10</jsf-myfaces.version>
<jsf-ri.version>1.2_15</jsf-ri.version>
<maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
<log4j.version>1.2.13</log4j.version>
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
index 308b826..a4d94ea 100644
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
+++ b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
@@ -33,9 +33,9 @@
<url>http://www.myorganization.org</url>
<properties>
- <jsf-myfaces.version>1.2.9</jsf-myfaces.version>
+ <jsf-myfaces.version>1.2.10</jsf-myfaces.version>
<jsf-ri.version>1.2_15</jsf-ri.version>
- <trinidad.version>1.2.13</trinidad.version>
+ <trinidad.version>1.2.14</trinidad.version>
<maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
<log4j.version>1.2.13</log4j.version>
</properties>
@@ -180,7 +180,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.8.1</version>
<scope>test</scope>
</dependency>
diff --git a/maven2-archetypes/myfaces-archetype-trinidad20/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-trinidad20/src/main/resources/archetype-resources/pom.xml
index c7eac27..70457bc 100644
--- a/maven2-archetypes/myfaces-archetype-trinidad20/src/main/resources/archetype-resources/pom.xml
+++ b/maven2-archetypes/myfaces-archetype-trinidad20/src/main/resources/archetype-resources/pom.xml
@@ -29,13 +29,13 @@
<artifactId>${artifactId}</artifactId>
<packaging>war</packaging>
<version>${version}</version>
- <name>A custom project using myfaces 1.2 with trinidad</name>
+ <name>A custom project using myfaces 2.0 with trinidad</name>
<url>http://www.myorganization.org</url>
<properties>
- <jsf-myfaces.version>2.0.1</jsf-myfaces.version>
- <jsf-mojarra.version>2.0.3</jsf-mojarra.version>
- <trinidad.version>2.0.0-alpha-2</trinidad.version>
+ <jsf-myfaces.version>2.0.4</jsf-myfaces.version>
+ <jsf-mojarra.version>2.0.5-b02</jsf-mojarra.version>
+ <trinidad.version>2.0.0-beta-2</trinidad.version>
<maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
</properties>
@@ -155,7 +155,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.8.1</version>
<scope>test</scope>
</dependency>
