From 1b1873bf267de58488a60b630063680d569885f8 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sat, 17 Jul 2010 09:13:53 +0000 Subject: [PATCH] [maven-release-plugin] rollback the release of STRUTS_2_2_1 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@965038 13f79535-47bb-0310-9956-ffa450edef68 --- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml | 8 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml | 2 +- apps/portlet/pom.xml | 8 +- apps/rest-showcase/pom.xml | 4 +- apps/showcase/pom.xml | 8 +- archetypes/pom.xml | 79 +++--- archetypes/struts2-archetype-blank/pom.xml | 4 +- .../struts2-archetype-convention/pom.xml | 90 +++---- .../struts2-archetype-dbportlet/pom.xml | 90 +++---- archetypes/struts2-archetype-plugin/pom.xml | 90 +++---- archetypes/struts2-archetype-portlet/pom.xml | 92 +++---- archetypes/struts2-archetype-starter/pom.xml | 4 +- assembly/pom.xml | 2 +- bundles/admin/pom.xml | 93 +++---- bundles/demo/pom.xml | 167 ++++++------- bundles/pom.xml | 163 +++++++------ core/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 160 ++++++------ plugins/dojo/pom.xml | 2 +- plugins/dwr/pom.xml | 75 ++++-- plugins/embeddedjsp/pom.xml | 229 ++++++++++-------- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 125 +++++----- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml | 2 +- plugins/junit/pom.xml | 129 ++++++---- plugins/osgi/pom.xml | 145 +++++------ plugins/oval/pom.xml | 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml | 4 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml | 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 131 +++++----- plugins/tiles/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 46 files changed, 1047 insertions(+), 899 deletions(-) diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index bef39c38e..accece47a 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-blank diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 045ac39ae..d52bf221c 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -21,12 +21,13 @@ * under the License. */ --> - + 4.0.0 org.apache.struts struts2-apps - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-jboss-blank @@ -35,7 +36,8 @@ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/jboss-blank/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/jboss-blank/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/jboss-blank/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/jboss-blank/ diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 979541105..cc848b13d 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-mailreader diff --git a/apps/pom.xml b/apps/pom.xml index a5c5753ef..0d9782c72 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-apps diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index a56d94c54..4dde7239b 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -21,12 +21,13 @@ * under the License. */ --> - + 4.0.0 org.apache.struts struts2-apps - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-portlet @@ -35,7 +36,8 @@ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/portlet/ diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 7e2ac75fa..48a1f567d 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,13 +26,13 @@ org.apache.struts struts2-apps - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-rest-showcase war - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT Struts 2 Rest Showcase Example Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 39e2f0a1e..53f4e3e20 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -21,12 +21,13 @@ * under the License. */ --> - + 4.0.0 org.apache.struts struts2-apps - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-showcase @@ -35,7 +36,8 @@ scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/showcase/ diff --git a/archetypes/pom.xml b/archetypes/pom.xml index eef3f799b..1ff89aa41 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -1,28 +1,51 @@ - - 4.0.0 - - org.apache.struts - struts2-parent - 2.2.2-SNAPSHOT - - org.apache.struts - struts2-archetypes - pom - Struts 2 Maven Archetypes - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/ - http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/ - - - - struts2-archetype-blank - struts2-archetype-convention - struts2-archetype-dbportlet - struts2-archetype-plugin - struts2-archetype-portlet - struts2-archetype-starter - - - \ No newline at end of file + + + + 4.0.0 + + org.apache.struts + struts2-parent + 2.2.1-SNAPSHOT + + org.apache.struts + struts2-archetypes + pom + Struts 2 Maven Archetypes + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/ + http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/ + + + + struts2-archetype-blank + struts2-archetype-convention + struts2-archetype-dbportlet + struts2-archetype-plugin + struts2-archetype-portlet + struts2-archetype-starter + + + diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index 6fc944bd5..3475a347a 100644 --- a/archetypes/struts2-archetype-blank/pom.xml +++ b/archetypes/struts2-archetype-blank/pom.xml @@ -3,12 +3,12 @@ org.apache.struts struts2-archetypes - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT 4.0.0 struts2-archetype-blank - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT Struts 2 Archetypes - Blank diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml index 98fab170a..a806048a7 100644 --- a/archetypes/struts2-archetype-convention/pom.xml +++ b/archetypes/struts2-archetype-convention/pom.xml @@ -1,46 +1,46 @@ - - - org.apache.struts - struts2-archetypes - 2.2.2-SNAPSHOT - - - 4.0.0 - struts2-archetype-convention - 2.2.2-SNAPSHOT - Struts 2 Archetypes - Blank Convention - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/ - http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/ - - - - true - - - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - + + + org.apache.struts + struts2-archetypes + 2.2.1-SNAPSHOT + + + 4.0.0 + struts2-archetype-convention + 2.2.1-SNAPSHOT + Struts 2 Archetypes - Blank Convention + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/ + http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/ + + + + true + + + + + release + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + \ No newline at end of file diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml index d7ed4cebc..ba0c8eb46 100644 --- a/archetypes/struts2-archetype-dbportlet/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/pom.xml @@ -1,46 +1,46 @@ - - - org.apache.struts - struts2-archetypes - 2.2.2-SNAPSHOT - - - 4.0.0 - struts2-archetype-dbportlet - 2.2.2-SNAPSHOT - Struts 2 Archetypes - Database Portlet - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/ - svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/ - - - - true - - - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - + + + org.apache.struts + struts2-archetypes + 2.2.1-SNAPSHOT + + + 4.0.0 + struts2-archetype-dbportlet + 2.2.1-SNAPSHOT + Struts 2 Archetypes - Database Portlet + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/ + svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/ + + + + true + + + + + release + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + \ No newline at end of file diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml index e505c6503..03e4b2f2d 100644 --- a/archetypes/struts2-archetype-plugin/pom.xml +++ b/archetypes/struts2-archetype-plugin/pom.xml @@ -1,46 +1,46 @@ - - - org.apache.struts - struts2-archetypes - 2.2.2-SNAPSHOT - - - 4.0.0 - struts2-archetype-plugin - 2.2.2-SNAPSHOT - jar - Struts 2 Archetypes - Plugin - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/ - http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/ - - - - true - - - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - + + + org.apache.struts + struts2-archetypes + 2.2.1-SNAPSHOT + + + 4.0.0 + struts2-archetype-plugin + 2.2.1-SNAPSHOT + jar + Struts 2 Archetypes - Plugin + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/ + http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/ + + + + true + + + + + release + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + \ No newline at end of file diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml index 50d71e4d5..043353837 100644 --- a/archetypes/struts2-archetype-portlet/pom.xml +++ b/archetypes/struts2-archetype-portlet/pom.xml @@ -1,47 +1,47 @@ - - - org.apache.struts - struts2-archetypes - 2.2.2-SNAPSHOT - - - 4.0.0 - struts2-archetype-portlet - 2.2.2-SNAPSHOT - jar - Struts 2 Archetypes - Portlet - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/ - http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/ - - - - true - - - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - + + + org.apache.struts + struts2-archetypes + 2.2.1-SNAPSHOT + + + 4.0.0 + struts2-archetype-portlet + 2.2.1-SNAPSHOT + jar + Struts 2 Archetypes - Portlet + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/ + http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/ + + + + true + + + + + release + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + \ No newline at end of file diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml index 40dcc0717..10f07ad3a 100644 --- a/archetypes/struts2-archetype-starter/pom.xml +++ b/archetypes/struts2-archetype-starter/pom.xml @@ -4,12 +4,12 @@ org.apache.struts struts2-archetypes - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT 4.0.0 struts2-archetype-starter - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT jar Struts 2 Archetypes - Starter diff --git a/assembly/pom.xml b/assembly/pom.xml index 15065e6a1..ae53216f0 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -11,7 +11,7 @@ org.apache.struts struts2-parent - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 44284f606..c19012eff 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -1,46 +1,47 @@ - - 4.0.0 - - org.apache.struts - struts2-osgi-bundles - 2.2.2-SNAPSHOT - - org.apache.struts - struts2-osgi-admin-bundle - bundle - Struts 2 OSGi Admin Bundle - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/admin/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/admin/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/bundles/admin/ - - - - - org.apache.struts - struts2-osgi-plugin - ${pom.version} - - - - - - - org.apache.felix - maven-bundle-plugin - true - 2.1.0 - - - META-INF - true - *,com.opensymphony.xwork2 - org.apache.struts2.osgi.admin* - *;create-asynchronously:=false - - - - - - \ No newline at end of file + + + 4.0.0 + + org.apache.struts + struts2-osgi-bundles + 2.2.1-SNAPSHOT + + org.apache.struts + struts2-osgi-admin-bundle + bundle + Struts 2 OSGi Admin Bundle + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/admin/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/admin/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/bundles/admin/ + + + + + org.apache.struts + struts2-osgi-plugin + ${pom.version} + + + + + + + org.apache.felix + maven-bundle-plugin + true + 2.1.0 + + + META-INF + true + *,com.opensymphony.xwork2 + org.apache.struts2.osgi.admin* + *;create-asynchronously:=false + + + + + + diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 902b623c5..ea2778d85 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -1,83 +1,84 @@ - - 4.0.0 - - org.apache.struts - struts2-osgi-bundles - 2.2.2-SNAPSHOT - - org.apache.struts - struts2-osgi-demo-bundle - bundle - Struts 2 OSGi Demo Bundle - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/demo/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/demo/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/bundles/demo/ - - - - - - org.apache.velocity - velocity - 1.6.3 - - - - org.apache.velocity - velocity-tools - 1.3 - - - velocity - velocity - - - - - - commons-digester - commons-digester - 1.8 - - - - org.apache.struts - struts2-core - ${pom.version} - - - - org.apache.struts - struts2-convention-plugin - ${pom.version} - - - - org.apache.struts - struts2-osgi-plugin - ${pom.version} - - - - - - - - org.apache.felix - maven-bundle-plugin - true - 2.1.0 - - - META-INF - *,com.opensymphony.xwork2 - *;create-asynchronously:=false - true - - - - - - \ No newline at end of file + + + 4.0.0 + + org.apache.struts + struts2-osgi-bundles + 2.2.1-SNAPSHOT + + org.apache.struts + struts2-osgi-demo-bundle + bundle + Struts 2 OSGi Demo Bundle + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/demo/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/demo/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/bundles/demo/ + + + + + + org.apache.velocity + velocity + 1.6.3 + + + + org.apache.velocity + velocity-tools + 1.3 + + + velocity + velocity + + + + + + commons-digester + commons-digester + 1.8 + + + + org.apache.struts + struts2-core + ${pom.version} + + + + org.apache.struts + struts2-convention-plugin + ${pom.version} + + + + org.apache.struts + struts2-osgi-plugin + ${pom.version} + + + + + + + + org.apache.felix + maven-bundle-plugin + true + 2.1.0 + + + META-INF + *,com.opensymphony.xwork2 + *;create-asynchronously:=false + true + + + + + + diff --git a/bundles/pom.xml b/bundles/pom.xml index 623bd59e7..ee53fd355 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -1,70 +1,93 @@ - - 4.0.0 - - org.apache.struts - struts2-parent - 2.2.2-SNAPSHOT - - org.apache.struts - struts2-osgi-bundles - pom - Struts OSGi Bundles - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/ - http://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/ - - - - admin - demo - - - - - - org.apache.struts - struts2-core - ${pom.version} - - - - - junit - junit - compile - 3.8.2 - - - - - javax.servlet - servlet-api - 2.4 - provided - - - - - - - - - org.codehaus.mojo - rat-maven-plugin - 1.0-alpha-2 - - - pom.xml - src/** - - - src/main/resources/*LICENSE.txt - - - - - - - \ No newline at end of file + + + + 4.0.0 + + org.apache.struts + struts2-parent + 2.2.1-SNAPSHOT + + org.apache.struts + struts2-osgi-bundles + pom + Struts OSGi Bundles + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/ + http://svn.apache.org/repos/asf/struts/struts2/trunk/bundles/ + + + + admin + demo + + + + + + org.apache.struts + struts2-core + ${pom.version} + + + + + junit + junit + compile + 3.8.2 + + + + + javax.servlet + servlet-api + 2.4 + provided + + + + + + + + + org.codehaus.mojo + rat-maven-plugin + 1.0-alpha-2 + + + pom.xml + src/** + + + src/main/resources/*LICENSE.txt + + + + + + + diff --git a/core/pom.xml b/core/pom.xml index 1be7d0b20..b27bcc02a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-core diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index 4d627d138..dfb4f176e 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-codebehind-plugin diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 6907da324..bf4e89ad9 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-config-browser-plugin diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index 4b3c4e5a5..fbdb857a0 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -1,80 +1,80 @@ - - 4.0.0 - - org.apache.struts - struts2-plugins - 2.2.2-SNAPSHOT - - org.apache.struts - struts2-convention-plugin - jar - Struts 2 Convention Plugin - - - scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-convention-plugin - scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-convention-plugin - http://svn.apache.org/viewcvs.cgi/struts/sandbox/trunk/struts2-convention-plugin - - - - - - true - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.apache.struts2.osgi.StrutsActivator - META-INF - - - - - - - - - junit - junit - test - 3.8.1 - - - org.easymock - easymock - 2.4 - test - - - org.easymock - easymockclassextension - 2.4 - test - - - javax.servlet - servlet-api - 2.4 - provided - - - javax.servlet - jsp-api - 2.0 - provided - - - \ No newline at end of file + + 4.0.0 + + org.apache.struts + struts2-plugins + 2.2.1-SNAPSHOT + + org.apache.struts + struts2-convention-plugin + jar + Struts 2 Convention Plugin + + + scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-convention-plugin + scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-convention-plugin + http://svn.apache.org/viewcvs.cgi/struts/sandbox/trunk/struts2-convention-plugin + + + + + + true + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.felix + maven-bundle-plugin + true + + + org.apache.struts2.osgi.StrutsActivator + META-INF + + + + + + + + + junit + junit + test + 3.8.1 + + + org.easymock + easymock + 2.4 + test + + + org.easymock + easymockclassextension + 2.4 + test + + + javax.servlet + servlet-api + 2.4 + provided + + + javax.servlet + jsp-api + 2.0 + provided + + + diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index 6fa967725..be9be4ad3 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -25,7 +25,7 @@ struts2-plugins org.apache.struts - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT 4.0.0 org.apache.struts diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index bb538b6b8..b3bec2f25 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -1,26 +1,49 @@ - - 4.0.0 - - org.apache.struts - struts2-plugins - 2.2.2-SNAPSHOT - - org.apache.struts - struts2-dwr-plugin - jar - Struts 2 DWR Plugin - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dwr/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dwr/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/dwr/ - - - - - uk.ltd.getahead - dwr - 1.1.1 - - - \ No newline at end of file + + + + 4.0.0 + + org.apache.struts + struts2-plugins + 2.2.1-SNAPSHOT + + org.apache.struts + struts2-dwr-plugin + jar + Struts 2 DWR Plugin + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dwr/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dwr/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/dwr/ + + + + + uk.ltd.getahead + dwr + 1.1.1 + + + diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 28ba00e8d..082820cbd 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -1,103 +1,126 @@ - - 4.0.0 - - org.apache.struts - struts2-plugins - 2.2.2-SNAPSHOT - - - org.apache.struts - struts2-embeddedjsp-plugin - jar - Struts 2 Embedded JSP Plugin - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/embeddedjsp/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/embeddedjsp/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/embeddedjsp/ - - - - - junit - junit - 3.8.1 - test - - - org.springframework - spring-test - 2.5.6 - test - - - org.springframework - spring-core - 2.5.6 - test - - - org.easymock - easymock - 2.4 - test - - - taglibs - request - 1.0.1 - test - - - javax.servlet.jsp - jsp-api - 2.1 - test - - - org.apache.tomcat - juli - 6.0.18 - - - javax.servlet - servlet-api - 2.4 - provided - - - taglibs - standard - 1.1.2 - test - - - javax.servlet - jstl - 1.1.2 - test - - - org.apache.tomcat - jasper - 6.0.18 - provided - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.4.2 - - - target/test-classes/jsps.jar - - never - - - - - \ No newline at end of file + + + + 4.0.0 + + org.apache.struts + struts2-plugins + 2.2.1-SNAPSHOT + + + org.apache.struts + struts2-embeddedjsp-plugin + jar + Struts 2 Embedded JSP Plugin + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/embeddedjsp/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/embeddedjsp/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/embeddedjsp/ + + + + + junit + junit + 3.8.1 + test + + + org.springframework + spring-test + 2.5.6 + test + + + org.springframework + spring-core + 2.5.6 + test + + + org.easymock + easymock + 2.4 + test + + + taglibs + request + 1.0.1 + test + + + javax.servlet.jsp + jsp-api + 2.1 + test + + + org.apache.tomcat + juli + 6.0.18 + + + javax.servlet + servlet-api + 2.4 + provided + + + taglibs + standard + 1.1.2 + test + + + javax.servlet + jstl + 1.1.2 + test + + + org.apache.tomcat + jasper + 6.0.18 + provided + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.4.2 + + + target/test-classes/jsps.jar + + never + + + + + diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index e3e256a0e..58b0dc9d4 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-jasperreports-plugin diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index 6a52395f6..16d4c0f80 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -1,62 +1,63 @@ - - 4.0.0 - - org.apache.struts - struts2-plugins - 2.2.2-SNAPSHOT - - org.apache.struts - struts2-javatemplates-plugin - jar - Struts 2 Java Templates Plugin - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/javatemplates/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/javatemplates/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/javatemplates/ - - - - - org.apache.struts - struts2-core - ${pom.version} - - - junit - junit - test - 3.8.1 - - - org.easymock - easymock - test - 2.4 - - - org.easymock - easymockclassextension - test - 2.4 - - - - - - - true - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - \ No newline at end of file + + + 4.0.0 + + org.apache.struts + struts2-plugins + 2.2.1-SNAPSHOT + + org.apache.struts + struts2-javatemplates-plugin + jar + Struts 2 Java Templates Plugin + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/javatemplates/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/javatemplates/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/javatemplates/ + + + + + org.apache.struts + struts2-core + ${pom.version} + + + junit + junit + test + 3.8.1 + + + org.easymock + easymock + test + 2.4 + + + org.easymock + easymockclassextension + test + 2.4 + + + + + + + true + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + + diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index 63b850242..8280e3450 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-jfreechart-plugin diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index b60972c97..3c5a120f2 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-jsf-plugin diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index 8fc60e246..2a7bc9ef0 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-json-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 2562df062..e76995101 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -1,53 +1,76 @@ - - 4.0.0 - - org.apache.struts - struts2-plugins - 2.2.2-SNAPSHOT - - org.apache.struts - struts2-junit-plugin - jar - Struts 2 JUnit Plugin - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/junit/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/junit/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/junit/ - - - - - junit - junit - 3.8.2 - - - org.springframework - spring-test - ${struts2.springPlatformVersion} - - - org.springframework - spring-core - ${struts2.springPlatformVersion} - - - org.springframework - spring-context - ${struts2.springPlatformVersion} - - - org.apache.struts - struts2-spring-plugin - ${pom.version} - true - - - javax.servlet - jsp-api - 2.0 - provided - - - \ No newline at end of file + + + + 4.0.0 + + org.apache.struts + struts2-plugins + 2.2.1-SNAPSHOT + + org.apache.struts + struts2-junit-plugin + jar + Struts 2 JUnit Plugin + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/junit/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/junit/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/junit/ + + + + + junit + junit + 3.8.2 + + + org.springframework + spring-test + ${struts2.springPlatformVersion} + + + org.springframework + spring-core + ${struts2.springPlatformVersion} + + + org.springframework + spring-context + ${struts2.springPlatformVersion} + + + org.apache.struts + struts2-spring-plugin + ${pom.version} + true + + + javax.servlet + jsp-api + 2.0 + provided + + + diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index bbe845c43..cd533382a 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -1,72 +1,73 @@ - - 4.0.0 - - org.apache.struts - struts2-plugins - 2.2.2-SNAPSHOT - - org.apache.struts - struts2-osgi-plugin - jar - Struts 2 OSGi Plugin - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/osgi/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/osgi/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/osgi/ - - - - - org.apache.felix - org.apache.felix.main - 1.4.1 - - - - org.apache.velocity - velocity - 1.6.3 - - - - org.apache.velocity - velocity-tools - 1.3 - - - velocity - velocity - - - javax.servlet - servlet-api - - - struts - struts - - - - - - commons-digester - commons-digester - 2.0 - - - - junit - junit - test - 3.8.1 - - - - org.easymock - easymock - test - 2.4 - - - \ No newline at end of file + + + 4.0.0 + + org.apache.struts + struts2-plugins + 2.2.1-SNAPSHOT + + org.apache.struts + struts2-osgi-plugin + jar + Struts 2 OSGi Plugin + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/osgi/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/osgi/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/osgi/ + + + + + org.apache.felix + org.apache.felix.main + 1.4.1 + + + + org.apache.velocity + velocity + 1.6.3 + + + + org.apache.velocity + velocity-tools + 1.3 + + + velocity + velocity + + + javax.servlet + servlet-api + + + struts + struts + + + + + + commons-digester + commons-digester + 2.0 + + + + junit + junit + test + 3.8.1 + + + + org.easymock + easymock + test + 2.4 + + + diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index 0351c53b3..fd2cd3926 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-oval-plugin diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index c07450a19..deb999c99 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-pell-multipart-plugin diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index fdb30389e..bbef7acb3 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-plexus-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 1e5dd2421..009f8cdad 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-plugins diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index 8453b2fd8..d96f3e055 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-portlet-plugin diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 6bb03b552..45d6525ad 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,11 +26,11 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-rest-plugin - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT Struts 2 REST Plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 189272541..acdfa84f9 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index f820b00af..c4e5ec2de 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-sitemesh-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 77af6a027..b2a7c3a45 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-spring-plugin diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index ab5a1e0e2..a361e7f94 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-struts1-plugin diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 7a5c496d8..616a9bfbf 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -1,54 +1,77 @@ - - 4.0.0 - - org.apache.struts - struts2-plugins - 2.2.2-SNAPSHOT - - org.apache.struts - struts2-testng-plugin - jar - Struts 2 TestNG Plugin - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/testng/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/testng/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/testng/ - - - - - org.testng - testng - 5.1 - jdk15 - - - org.springframework - spring-test - ${struts2.springPlatformVersion} - - - org.springframework - spring-core - ${struts2.springPlatformVersion} - - - - javax.servlet - servlet-api - 2.4 - provided - - - - javax.servlet - jsp-api - 2.0 - provided - - - - - - \ No newline at end of file + + + + 4.0.0 + + org.apache.struts + struts2-plugins + 2.2.1-SNAPSHOT + + org.apache.struts + struts2-testng-plugin + jar + Struts 2 TestNG Plugin + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/testng/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/testng/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/testng/ + + + + + org.testng + testng + 5.1 + jdk15 + + + org.springframework + spring-test + ${struts2.springPlatformVersion} + + + org.springframework + spring-core + ${struts2.springPlatformVersion} + + + + javax.servlet + servlet-api + 2.4 + provided + + + + javax.servlet + jsp-api + 2.0 + provided + + + + + + diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index db16e4911..367a98ff8 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts struts2-tiles-plugin diff --git a/pom.xml b/pom.xml index d6208b3d8..ba632b19a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 org.apache.struts struts2-parent - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT pom Struts 2 http://struts.apache.org/struts2 diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml index 9f313f349..a29b4110e 100644 --- a/xwork-core/pom.xml +++ b/xwork-core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.2.2-SNAPSHOT + 2.2.1-SNAPSHOT org.apache.struts.xwork