Author: lukaszlenart
Date: Wed Dec 1 14:39:57 2010
New Revision: 1041022
URL: http://svn.apache.org/viewvc?rev=1041022&view=rev
Log:
Preparing 2.2.1.1 release
Modified:
struts/struts2/branches/STRUTS_2_2_1_1/apps/blank/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/apps/jboss-blank/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/apps/mailreader/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/apps/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/apps/portlet/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/apps/rest-showcase/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/apps/showcase/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-blank/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-convention/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-dbportlet/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-plugin/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-portlet/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-starter/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/assembly/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/bundles/admin/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/bundles/demo/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/bundles/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/core/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/codebehind/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/config-browser/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/convention/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/dojo/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/dwr/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/embeddedjsp/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/jasperreports/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/javatemplates/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/jfreechart/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/jsf/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/json/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/junit/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/osgi/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/oval/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/pell-multipart/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/plexus/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/portlet/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/rest/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/sitegraph/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/sitemesh/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/spring/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/struts1/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/testng/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/plugins/tiles/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/pom.xml
struts/struts2/branches/STRUTS_2_2_1_1/xwork-core/pom.xml
Modified: struts/struts2/branches/STRUTS_2_2_1_1/apps/blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/apps/blank/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/apps/blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/apps/blank/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-blank</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/apps/jboss-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/apps/jboss-blank/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/apps/jboss-blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/apps/jboss-blank/pom.xml Wed Dec 1
14:39:57 2010
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-jboss-blank</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/apps/mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/apps/mailreader/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/apps/mailreader/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/apps/mailreader/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-mailreader</artifactId>
@@ -44,7 +44,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/apps/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/apps/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/apps/pom.xml Wed Dec 1 14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/apps/portlet/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/apps/portlet/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/apps/portlet/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-portlet</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/apps/rest-showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/apps/rest-showcase/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/apps/rest-showcase/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/apps/rest-showcase/pom.xml Wed Dec
1 14:39:57 2010
@@ -26,13 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.2.1</version>
<name>Struts 2 Rest Showcase Example</name>
<description>Struts 2 Rest Showcase Example</description>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/apps/showcase/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/apps/showcase/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/apps/showcase/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-showcase</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/archetypes/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/archetypes/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/archetypes/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/archetypes/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
Modified:
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-blank/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
---
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-blank/pom.xml
(original)
+++
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-blank/pom.xml
Wed Dec 1 14:39:57 2010
@@ -3,12 +3,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.2.1</version>
<name>Struts 2 Archetypes - Blank</name>
<scm>
Modified:
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-convention/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-convention/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
---
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-convention/pom.xml
(original)
+++
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-convention/pom.xml
Wed Dec 1 14:39:57 2010
@@ -2,12 +2,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-convention</artifactId>
- <version>2.2.1</version>
<name>Struts 2 Archetypes - Blank Convention</name>
<scm>
Modified:
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-dbportlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-dbportlet/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
---
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-dbportlet/pom.xml
(original)
+++
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-dbportlet/pom.xml
Wed Dec 1 14:39:57 2010
@@ -2,12 +2,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <version>2.2.1</version>
<name>Struts 2 Archetypes - Database Portlet</name>
<scm>
Modified:
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-plugin/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
---
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-plugin/pom.xml
(original)
+++
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-plugin/pom.xml
Wed Dec 1 14:39:57 2010
@@ -2,12 +2,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-plugin</artifactId>
- <version>2.2.1</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Plugin</name>
Modified:
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-portlet/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
---
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-portlet/pom.xml
(original)
+++
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-portlet/pom.xml
Wed Dec 1 14:39:57 2010
@@ -2,12 +2,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-portlet</artifactId>
- <version>2.2.1</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Portlet</name>
Modified:
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-starter/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-starter/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
---
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-starter/pom.xml
(original)
+++
struts/struts2/branches/STRUTS_2_2_1_1/archetypes/struts2-archetype-starter/pom.xml
Wed Dec 1 14:39:57 2010
@@ -4,12 +4,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-starter</artifactId>
- <version>2.2.1</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Starter</name>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/assembly/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/assembly/pom.xml Wed Dec 1 14:39:57
2010
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<scm>
@@ -198,6 +198,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<id>copy-war</id>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/bundles/admin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/bundles/admin/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/bundles/admin/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/bundles/admin/pom.xml Wed Dec 1
14:39:57 2010
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-admin-bundle</artifactId>
@@ -31,7 +31,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.1.0</version>
<configuration>
<instructions>
<manifestLocation>META-INF</manifestLocation>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/bundles/demo/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/bundles/demo/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/bundles/demo/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/bundles/demo/pom.xml Wed Dec 1
14:39:57 2010
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-demo-bundle</artifactId>
@@ -69,7 +69,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.1.0</version>
<configuration>
<instructions>
<manifestLocation>META-INF</manifestLocation>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/bundles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/bundles/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/bundles/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/bundles/pom.xml Wed Dec 1 14:39:57
2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/core/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/core/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/core/pom.xml Wed Dec 1 14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.apache.struts.xwork</groupId>
<artifactId>xwork-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<!--<dependency>-->
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/codebehind/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/codebehind/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/codebehind/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/codebehind/pom.xml Wed Dec
1 14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-codebehind-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/config-browser/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/config-browser/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/config-browser/pom.xml
(original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/config-browser/pom.xml Wed
Dec 1 14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-config-browser-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/convention/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/convention/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/convention/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/convention/pom.xml Wed Dec
1 14:39:57 2010
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-convention-plugin</artifactId>
@@ -50,30 +50,25 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>3.8.1</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/dojo/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/dojo/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/dojo/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/dojo/pom.xml Wed Dec 1
14:39:57 2010
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.struts</groupId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/dwr/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/dwr/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/dwr/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/dwr/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-dwr-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/embeddedjsp/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/embeddedjsp/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/embeddedjsp/pom.xml
(original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/embeddedjsp/pom.xml Wed Dec
1 14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/jasperreports/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/jasperreports/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/jasperreports/pom.xml
(original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/jasperreports/pom.xml Wed
Dec 1 14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-jasperreports-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/javatemplates/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/javatemplates/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/javatemplates/pom.xml
(original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/javatemplates/pom.xml Wed
Dec 1 14:39:57 2010
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-javatemplates-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/jfreechart/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/jfreechart/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/jfreechart/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/jfreechart/pom.xml Wed Dec
1 14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-jfreechart-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/jsf/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/jsf/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/jsf/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/jsf/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-jsf-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/json/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/json/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/json/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/json/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-json-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/junit/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/junit/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/junit/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/junit/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/osgi/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/osgi/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/osgi/pom.xml Wed Dec 1
14:39:57 2010
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/oval/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/oval/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/oval/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/oval/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-oval-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/pell-multipart/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/pell-multipart/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/pell-multipart/pom.xml
(original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/pell-multipart/pom.xml Wed
Dec 1 14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-pell-multipart-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/plexus/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/plexus/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/plexus/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/plexus/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plexus-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/pom.xml Wed Dec 1 14:39:57
2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
@@ -79,18 +79,14 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
- <version>3.8.2</version>
</dependency>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
-
</dependencies>
<reporting>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/portlet/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/portlet/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/portlet/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-portlet-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/rest/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/rest/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/rest/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/rest/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,11 +26,10 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.2.1</version>
<name>Struts 2 REST Plugin</name>
<dependencies>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/sitegraph/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/sitegraph/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/sitegraph/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/sitegraph/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-sitegraph-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/sitemesh/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/sitemesh/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/sitemesh/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/sitemesh/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-sitemesh-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/spring/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/spring/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/spring/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/spring/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/struts1/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/struts1/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/struts1/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/struts1/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-struts1-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/testng/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/testng/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/testng/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/testng/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-testng-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/plugins/tiles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/plugins/tiles/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/plugins/tiles/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/plugins/tiles/pom.xml Wed Dec 1
14:39:57 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-tiles-plugin</artifactId>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/pom.xml Wed Dec 1 14:39:57 2010
@@ -131,58 +131,61 @@
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <jdkName>1.5</jdkName>
+ <exclude>target,test-output,.clover</exclude>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/TestBean.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.1.0</version>
+ </plugin>
+
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <exclude>target,test-output,.clover</exclude>
- <useShortDependencyNames>true</useShortDependencyNames>
- <!--
- <libraries>
- <library>
- <name>xwork</name>
- <sources>file://$xwork$/src/java</sources>
- </library>
- <library>
- <name>xwork-tiger</name>
- <sources>file://$xwork$/tiger/src/java</sources>
- </library>
- </libraries>
- -->
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/TestBean.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.1</version>
<configuration>
- <preparationGoals>clean verify install</preparationGoals>
+ <releaseProfiles>release</releaseProfiles>
+ <goals>deploy</goals>
</configuration>
</plugin>
<plugin>
@@ -196,7 +199,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.1.0</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -348,15 +350,49 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.8.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
</dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.8.0.GA</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
Modified: struts/struts2/branches/STRUTS_2_2_1_1/xwork-core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_2_1_1/xwork-core/pom.xml?rev=1041022&r1=1041021&r2=1041022&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_2_1_1/xwork-core/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_2_1_1/xwork-core/pom.xml Wed Dec 1
14:39:57 2010
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.2.1</version>
+ <version>2.2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
@@ -129,6 +129,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.4</version>
<executions>
<execution>
<goals>
