Author: lukaszlenart
Date: Tue Nov 10 18:54:46 2009
New Revision: 834598
URL: http://svn.apache.org/viewvc?rev=834598&view=rev
Log:
Updated archetype to version 2.1.8 of Struts
Modified:
struts/maven/trunk/struts2-archetype-starter/pom.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
Modified: struts/maven/trunk/struts2-archetype-starter/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/pom.xml?rev=834598&r1=834597&r2=834598&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/pom.xml (original)
+++ struts/maven/trunk/struts2-archetype-starter/pom.xml Tue Nov 10 18:54:46
2009
@@ -9,8 +9,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-starter</artifactId>
- <version>2.0.12-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
+ <version>2.1.8</version>
+ <packaging>jar</packaging>
<name>Struts 2 Archetypes - Starter</name>
<scm>
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml?rev=834598&r1=834597&r2=834598&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
Tue Nov 10 18:54:46 2009
@@ -9,7 +9,11 @@
<name>Struts 2 Starter</name>
<url>http://www.myComp.com</url>
<description>Struts 2 Starter</description>
-
+
+ <properties>
+ <struts2.version>2.1.8</struts2.version>
+ </properties>
+
<dependencies>
<!-- Junit -->
<dependency>
@@ -23,17 +27,19 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
- <version>2.0.11</version>
+ <version>${struts2.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-sitemesh-plugin</artifactId>
- <version>2.0.11</version>
+ <version>${struts2.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
- <version>2.0.11</version>
+ <version>${struts2.version}</version>
</dependency>
<!-- Servlet & Jsp -->
@@ -43,6 +49,7 @@
<version>2.4</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
@@ -78,7 +85,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.5</version>
+ <version>6.1.21</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java?rev=834598&r1=834597&r2=834598&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
Tue Nov 10 18:54:46 2009
@@ -21,7 +21,7 @@
import java.text.ParseException;
import java.util.Map;
import java.util.Date;
-import com.opensymphony.xwork2.util.TypeConversionException;
+import com.opensymphony.xwork2.conversion.TypeConversionException;
/**
*
