From dbcdbd0d129657ddceafbd8df36406e4bb7b7b91 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 1 May 2014 11:21:13 +0200 Subject: [PATCH 1/8] Correct type with release-plugin version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc336c1c3e..579ddcb0d1 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-release-plugin - 2.52 + 2.5 org.apache.maven.plugins From 1a668af7f1ffccea4a3b46d8d8c1fe1c7331ff02 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 1 May 2014 11:31:12 +0200 Subject: [PATCH 2/8] Uses the same logic as in ParametersInterceptor to use st of patterns to exclude cookies which tries to access Struts internal state --- .../interceptor/CookieInterceptor.java | 45 ++++++++++------ .../interceptor/CookieInterceptorTest.java | 53 +++++++++++++++++++ 2 files changed, 82 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java index 3e2e81d321..340b57f813 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java @@ -33,6 +33,7 @@ import javax.servlet.http.Cookie; import java.util.Collections; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -175,7 +176,13 @@ public class CookieInterceptor extends AbstractInterceptor { // Allowed names of cookies private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PATTERN, Pattern.CASE_INSENSITIVE); - private Pattern excludedPattern = Pattern.compile(ExcludedPatterns.CLASS_ACCESS_PATTERN, Pattern.CASE_INSENSITIVE); + private Set excludedPatterns = new HashSet(); + + public CookieInterceptor() { + for (String pattern : ExcludedPatterns.EXCLUDED_PATTERNS) { + excludedPatterns.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE)); + } + } /** * Set the cookiesName which if matched will allow the cookie @@ -253,13 +260,16 @@ public String intercept(ActionInvocation invocation) throws Exception { * @return true|false */ protected boolean isAcceptableValue(String value) { - boolean matches = !excludedPattern.matcher(value).matches(); - if (!matches) { - if (LOG.isTraceEnabled()) { - LOG.trace("Cookie value [#0] matches excludedPattern [#1]", value, ExcludedPatterns.CLASS_ACCESS_PATTERN); + for (Pattern excludedPattern : excludedPatterns) { + boolean matches = !excludedPattern.matcher(value).matches(); + if (!matches) { + if (LOG.isTraceEnabled()) { + LOG.trace("Cookie value [#0] matches excludedPattern [#1]", value, excludedPattern.toString()); + } + return false; } } - return matches; + return true; } /** @@ -293,23 +303,26 @@ protected boolean isAccepted(String name) { } /** - * Checks if name of Cookie match {@link #excludedPattern} + * Checks if name of Cookie match {@link #excludedPatterns} * * @param name of Cookie * @return true|false */ protected boolean isExcluded(String name) { - boolean matches = excludedPattern.matcher(name).matches(); - if (matches) { - if (LOG.isTraceEnabled()) { - LOG.trace("Cookie [#0] matches excludedPattern [#1]", name, ExcludedPatterns.CLASS_ACCESS_PATTERN); - } - } else { - if (LOG.isTraceEnabled()) { - LOG.trace("Cookie [#0] doesn't match excludedPattern [#1]", name, ExcludedPatterns.CLASS_ACCESS_PATTERN); + for (Pattern excludedPattern : excludedPatterns) { + boolean matches = excludedPattern.matcher(name).matches(); + if (matches) { + if (LOG.isTraceEnabled()) { + LOG.trace("Cookie [#0] matches excludedPattern [#1]", name, excludedPattern.toString()); + } + return true; + } else { + if (LOG.isTraceEnabled()) { + LOG.trace("Cookie [#0] doesn't match excludedPattern [#1]", name, excludedPattern.toString()); + } } } - return matches; + return false; } /** diff --git a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java index d1014a8de8..99ba15164d 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java @@ -383,6 +383,59 @@ protected boolean isAcceptableValue(String value) { assertFalse(excludedValue.get(pollution6)); } + public void testCookiesWithStrutsInternalsAccess() throws Exception { + MockHttpServletRequest request = new MockHttpServletRequest(); + String sessionCookieName = "session.userId"; + String sessionCookieValue = "session.userId=1"; + String appCookieName = "application.userId"; + String appCookieValue = "application.userId=1"; + String reqCookieName = "request.userId"; + String reqCookieValue = "request.userId=1"; + + request.setCookies( + new Cookie(sessionCookieName, "1"), + new Cookie("1", sessionCookieValue), + new Cookie(appCookieName, "1"), + new Cookie("1", appCookieValue), + new Cookie(reqCookieName, "1"), + new Cookie("1", reqCookieValue) + ); + ServletActionContext.setRequest(request); + + final Map excludedName = new HashMap(); + final Map excludedValue = new HashMap(); + + CookieInterceptor interceptor = new CookieInterceptor() { + @Override + protected boolean isAcceptableName(String name) { + boolean accepted = super.isAcceptableName(name); + excludedName.put(name, accepted); + return accepted; + } + + @Override + protected boolean isAcceptableValue(String value) { + boolean accepted = super.isAcceptableValue(value); + excludedValue.put(value, accepted); + return accepted; + } + }; + interceptor.setCookiesName("*"); + + MockActionInvocation invocation = new MockActionInvocation(); + invocation.setAction(new MockActionWithCookieAware()); + + interceptor.intercept(invocation); + + assertFalse(excludedName.get(sessionCookieName)); + assertFalse(excludedName.get(appCookieName)); + assertFalse(excludedName.get(reqCookieName)); + + assertFalse(excludedValue.get(sessionCookieValue)); + assertFalse(excludedValue.get(appCookieValue)); + assertFalse(excludedValue.get(reqCookieValue)); + } + public static class MockActionWithCookieAware extends ActionSupport implements CookiesAware { private static final long serialVersionUID = -6202290616812813386L; From 769e815c6e0a72b25812ff1c4526105be9491e0c Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 2 May 2014 15:35:31 +0200 Subject: [PATCH 3/8] Uses wget to fetch docs instead re-exporting pages from wiki --- assembly/pom.xml | 86 ++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 50 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 7984c29bae..56a551b2d6 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -76,6 +76,42 @@ + + maven-antrun-plugin + + + cwiki-docs + prepare-package + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + maven-assembly-plugin @@ -103,58 +139,8 @@ - - - export-cwiki - - - !skipWiki - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - - cwiki-docs - prepare-package - - java - - - runtime - true - org.apache.cxf.cwiki.SiteExporter - - -d - ${project.build.directory}/cwiki/WW - -password - ${confluence.password} - -user - ${confluence.user} - ${basedir}/src/main/resources/docs.cfg - - - - - - - - - - - - org.apache.cxf.site-export - cxf-site-export - 1.0-SNAPSHOT - runtime - - org.apache.struts struts2-cdi-plugin From bca525da8ddf73da634b7e906254a66294293909 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 2 May 2014 15:36:19 +0200 Subject: [PATCH 4/8] Sets version in poms to -SNAPSHOT --- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml | 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml | 2 +- apps/portlet/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml | 4 ++-- archetypes/struts2-archetype-starter/pom.xml | 4 ++-- assembly/pom.xml | 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml | 2 +- bundles/pom.xml | 2 +- core/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml | 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml | 2 +- plugins/oval/pom.xml | 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/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 | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 51 files changed, 60 insertions(+), 60 deletions(-) diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 6054fc429f..81a88d5753 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-blank diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 0aebae0844..b77c9779f0 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-jboss-blank diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index f2fc344ce5..bb7ae7c676 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-mailreader diff --git a/apps/pom.xml b/apps/pom.xml index a16b4d7489..3444414bc6 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT org.apache.struts struts2-apps diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index f98d72ba68..e105aab540 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-portlet diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index b0c6589254..55d5d5f19a 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-rest-showcase war - 2.3.16.2 + 2.3.16.3-SNAPSHOT Struts 2 Rest Showcase Example Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 6cf2aefd72..9d52e4b6e4 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-showcase diff --git a/archetypes/pom.xml b/archetypes/pom.xml index bf9b7f8080..fcf351ba84 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT org.apache.struts struts2-archetypes diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml index a15b957216..3f40657044 100644 --- a/archetypes/struts2-archetype-angularjs/pom.xml +++ b/archetypes/struts2-archetype-angularjs/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-angularjs - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Angular JS diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index 237b35a1f3..00a6f4bab3 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.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-blank - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Blank diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml index aa3e82016e..fca83b0e29 100644 --- a/archetypes/struts2-archetype-convention/pom.xml +++ b/archetypes/struts2-archetype-convention/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-convention - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Blank Convention diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml index c1e77493b6..15a48ed01f 100644 --- a/archetypes/struts2-archetype-dbportlet/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-dbportlet - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Database Portlet diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml index 8535f80a55..bdb702f154 100644 --- a/archetypes/struts2-archetype-plugin/pom.xml +++ b/archetypes/struts2-archetype-plugin/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-plugin - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Plugin diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml index a3baed8354..1bc6d9ffa9 100644 --- a/archetypes/struts2-archetype-portlet/pom.xml +++ b/archetypes/struts2-archetype-portlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-portlet - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Portlet diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml index 229a591617..935b47162c 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.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 struts2-archetype-starter - 2.3.16.2 + 2.3.16.3-SNAPSHOT jar Struts 2 Archetypes - Starter diff --git a/assembly/pom.xml b/assembly/pom.xml index 56a551b2d6..95b3a0c324 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-assembly diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index e9fdc78087..5ea89c4cc7 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index a8613a3ead..0f67c7d299 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index b86c91fc1f..f896c0c4e6 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 02aee40f1c..6404358f55 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-core jar diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 8cd0325f94..ba6bbf26ba 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-cdi-plugin diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index e978b792a2..78701b28bb 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-codebehind-plugin diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 284f1c707a..7a9016b724 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-config-browser-plugin diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index a55a797792..54346ba3c1 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-convention-plugin diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index 29846eafc2..f0f950daec 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -25,7 +25,7 @@ struts2-plugins org.apache.struts - 2.3.16.2 + 2.3.16.3-SNAPSHOT 4.0.0 diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index dba899b0ae..76259d2f6f 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-dwr-plugin diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 51488bef5c..19b85fc835 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-embeddedjsp-plugin diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index 5ef6f6b3e9..d984aca07a 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-gxp-plugin diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 3cf1c9434e..45d22b2aaf 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-jasperreports-plugin diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index e3a44c4fd3..6d3ff2d840 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-javatemplates-plugin diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index 849c815feb..bb888b922f 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-jfreechart-plugin diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index 33d00ea094..3f284ab1d9 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-jsf-plugin diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index 444d311bb2..f77b226ff5 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-json-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 2571fcb2c1..6d02695efc 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-junit-plugin diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index 11e2c22d37..2762bfa1d0 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-osgi-plugin diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index 457383fa9d..997b2a76cd 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-oval-plugin diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index b2ab339f1f..307fc055bf 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-pell-multipart-plugin diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 8569137e7f..79ce6afa06 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-plexus-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index d98fc9a190..0d764e6405 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-plugins diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml index 9d41d84fdf..a937e7cfc6 100644 --- a/plugins/portlet-tiles/pom.xml +++ b/plugins/portlet-tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-portlet-tiles-plugin diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index 8134dad7d5..4bea2e73ed 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-portlet-plugin diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index aec40754d7..3c416a4545 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,11 +26,11 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-rest-plugin - 2.3.16.2 + 2.3.16.3-SNAPSHOT Struts 2 REST Plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 243b1d261f..829f883c9f 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index 3c7b1b8319..717c2bfafe 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-sitemesh-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 6bcf25262c..c5bf45b3b8 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-spring-plugin diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index fb847998c8..fbbd4f19de 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-struts1-plugin diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index eec0caf713..6879f548b8 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-testng-plugin diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 47b3980e81..f3fa2b6ad8 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-tiles-plugin diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml index 77fb083f6e..2204fcf196 100644 --- a/plugins/tiles3/pom.xml +++ b/plugins/tiles3/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-tiles3-plugin diff --git a/pom.xml b/pom.xml index 579ddcb0d1..638a5bdcc7 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT pom Struts 2 http://struts.apache.org/ diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml index 34fe8e2d9a..9d1c34cd61 100644 --- a/xwork-core/pom.xml +++ b/xwork-core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.3.16.2 + 2.3.16.3-SNAPSHOT org.apache.struts.xwork From 0761909c65f32a0df9fc392704bf9d248bfea2c8 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 2 May 2014 15:47:34 +0200 Subject: [PATCH 5/8] Updates docs assembly with new location of exported pages --- assembly/src/main/assembly/docs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml index 77dffcb6c8..b1f99919d6 100644 --- a/assembly/src/main/assembly/docs.xml +++ b/assembly/src/main/assembly/docs.xml @@ -47,7 +47,7 @@ - target/cwiki/WW/docs + target/cwiki/ docs From e03ff728618f5bf551083fc3a52d43c07434bbc9 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 2 May 2014 17:10:41 +0200 Subject: [PATCH 6/8] [maven-release-plugin] prepare release STRUTS_2_3_16_3 --- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml | 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml | 2 +- apps/portlet/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml | 4 ++-- archetypes/struts2-archetype-starter/pom.xml | 4 ++-- assembly/pom.xml | 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml | 2 +- bundles/pom.xml | 2 +- core/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml | 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml | 2 +- plugins/oval/pom.xml | 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/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 | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 81a88d5753..b7343c6b68 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-blank diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index b77c9779f0..62c6803c67 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-jboss-blank diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index bb7ae7c676..c41bb766e0 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-mailreader diff --git a/apps/pom.xml b/apps/pom.xml index 3444414bc6..c89f4cc6ba 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.3-SNAPSHOT + 2.3.16.3 org.apache.struts struts2-apps diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index e105aab540..5100b4e72d 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-portlet diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 55d5d5f19a..fdd6c8b3d6 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-rest-showcase war - 2.3.16.3-SNAPSHOT + 2.3.16.3 Struts 2 Rest Showcase Example Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 9d52e4b6e4..68ca56555f 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-showcase diff --git a/archetypes/pom.xml b/archetypes/pom.xml index fcf351ba84..02083e0c21 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.3-SNAPSHOT + 2.3.16.3 org.apache.struts struts2-archetypes diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml index 3f40657044..2235e440cc 100644 --- a/archetypes/struts2-archetype-angularjs/pom.xml +++ b/archetypes/struts2-archetype-angularjs/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.3-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-angularjs - 2.3.16.3-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Angular JS diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index 00a6f4bab3..c6473bd387 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.3.16.3-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-blank - 2.3.16.3-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Blank diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml index fca83b0e29..b6c34d0fcb 100644 --- a/archetypes/struts2-archetype-convention/pom.xml +++ b/archetypes/struts2-archetype-convention/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.3-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-convention - 2.3.16.3-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Blank Convention diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml index 15a48ed01f..d918d13d83 100644 --- a/archetypes/struts2-archetype-dbportlet/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.3-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-dbportlet - 2.3.16.3-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Database Portlet diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml index bdb702f154..8c47dbf1c4 100644 --- a/archetypes/struts2-archetype-plugin/pom.xml +++ b/archetypes/struts2-archetype-plugin/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.3-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-plugin - 2.3.16.3-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Plugin diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml index 1bc6d9ffa9..a6be6f7cca 100644 --- a/archetypes/struts2-archetype-portlet/pom.xml +++ b/archetypes/struts2-archetype-portlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.3-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-portlet - 2.3.16.3-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Portlet diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml index 935b47162c..742e0b9e4e 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.3.16.3-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-starter - 2.3.16.3-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Starter diff --git a/assembly/pom.xml b/assembly/pom.xml index 95b3a0c324..1c3c55f105 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-assembly diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 5ea89c4cc7..57134616f3 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 0f67c7d299..145034a383 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index f896c0c4e6..b87e697f21 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 6404358f55..c53059cb32 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-core jar diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index ba6bbf26ba..1757de63a8 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-cdi-plugin diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index 78701b28bb..ab09d6d464 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-codebehind-plugin diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 7a9016b724..2a1dacef11 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-config-browser-plugin diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index 54346ba3c1..137aed5501 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-convention-plugin diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index f0f950daec..88606e43ad 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -25,7 +25,7 @@ struts2-plugins org.apache.struts - 2.3.16.3-SNAPSHOT + 2.3.16.3 4.0.0 diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index 76259d2f6f..19033d2c30 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-dwr-plugin diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 19b85fc835..604a876ece 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-embeddedjsp-plugin diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index d984aca07a..cd9c826e99 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-gxp-plugin diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 45d22b2aaf..605b92c6ac 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-jasperreports-plugin diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index 6d3ff2d840..611f4215ca 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-javatemplates-plugin diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index bb888b922f..395b4154f2 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-jfreechart-plugin diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index 3f284ab1d9..67205978e3 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-jsf-plugin diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index f77b226ff5..9daa09cfb5 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-json-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 6d02695efc..7baff8c221 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-junit-plugin diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index 2762bfa1d0..e89c417c57 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-osgi-plugin diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index 997b2a76cd..630506509a 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-oval-plugin diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index 307fc055bf..54fa30517f 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-pell-multipart-plugin diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 79ce6afa06..841032b095 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-plexus-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 0d764e6405..7a63dd3b96 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-plugins diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml index a937e7cfc6..8bf28d3ee8 100644 --- a/plugins/portlet-tiles/pom.xml +++ b/plugins/portlet-tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-portlet-tiles-plugin diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index 4bea2e73ed..e5c10571b5 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-portlet-plugin diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 3c416a4545..62f4e7756a 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,11 +26,11 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-rest-plugin - 2.3.16.3-SNAPSHOT + 2.3.16.3 Struts 2 REST Plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 829f883c9f..b3aaf14849 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index 717c2bfafe..f5a4569dcc 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-sitemesh-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index c5bf45b3b8..0803160eda 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-spring-plugin diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index fbbd4f19de..f59047f6dc 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-struts1-plugin diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 6879f548b8..5f23c4e6a8 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-testng-plugin diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index f3fa2b6ad8..b6dc52633e 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-tiles-plugin diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml index 2204fcf196..3361d1cd14 100644 --- a/plugins/tiles3/pom.xml +++ b/plugins/tiles3/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-tiles3-plugin diff --git a/pom.xml b/pom.xml index 638a5bdcc7..1d2b7e5db2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 struts2-parent - 2.3.16.3-SNAPSHOT + 2.3.16.3 pom Struts 2 http://struts.apache.org/ @@ -31,7 +31,7 @@ scm:git:git://git.apache.org/struts.git scm:git:https://git-wip-us.apache.org/repos/asf/struts.git http://git.apache.org/struts.git - STRUTS_2_3_16_2 + STRUTS_2_3_16_3 diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml index 9d1c34cd61..710f635ec5 100644 --- a/xwork-core/pom.xml +++ b/xwork-core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.3.16.3-SNAPSHOT + 2.3.16.3 org.apache.struts.xwork From bcffc256fa27506588628a4df51977677c8d24aa Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 2 May 2014 17:10:54 +0200 Subject: [PATCH 7/8] [maven-release-plugin] prepare for next development iteration --- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml | 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml | 2 +- apps/portlet/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml | 4 ++-- archetypes/struts2-archetype-starter/pom.xml | 4 ++-- assembly/pom.xml | 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml | 2 +- bundles/pom.xml | 2 +- core/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml | 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml | 2 +- plugins/oval/pom.xml | 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/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 | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index b7343c6b68..317a2b4e71 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-blank diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 62c6803c67..1454f7b1a0 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-jboss-blank diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index c41bb766e0..7814520744 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-mailreader diff --git a/apps/pom.xml b/apps/pom.xml index c89f4cc6ba..d0a24d01e2 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.3 + 2.3.16.4-SNAPSHOT org.apache.struts struts2-apps diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index 5100b4e72d..3698ac47fd 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-portlet diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index fdd6c8b3d6..fe2d3be20c 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-rest-showcase war - 2.3.16.3 + 2.3.16.4-SNAPSHOT Struts 2 Rest Showcase Example Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 68ca56555f..6a0c317ae3 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-showcase diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 02083e0c21..c7ca432610 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.3 + 2.3.16.4-SNAPSHOT org.apache.struts struts2-archetypes diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml index 2235e440cc..95fc42aae6 100644 --- a/archetypes/struts2-archetype-angularjs/pom.xml +++ b/archetypes/struts2-archetype-angularjs/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.3 + 2.3.16.4-SNAPSHOT 4.0.0 struts2-archetype-angularjs - 2.3.16.3 + 2.3.16.4-SNAPSHOT jar Struts 2 Archetypes - Angular JS diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index c6473bd387..0bb43219fa 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.3.16.3 + 2.3.16.4-SNAPSHOT 4.0.0 struts2-archetype-blank - 2.3.16.3 + 2.3.16.4-SNAPSHOT jar Struts 2 Archetypes - Blank diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml index b6c34d0fcb..e6c912bf47 100644 --- a/archetypes/struts2-archetype-convention/pom.xml +++ b/archetypes/struts2-archetype-convention/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.3 + 2.3.16.4-SNAPSHOT 4.0.0 struts2-archetype-convention - 2.3.16.3 + 2.3.16.4-SNAPSHOT jar Struts 2 Archetypes - Blank Convention diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml index d918d13d83..a25f8d03bf 100644 --- a/archetypes/struts2-archetype-dbportlet/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.3 + 2.3.16.4-SNAPSHOT 4.0.0 struts2-archetype-dbportlet - 2.3.16.3 + 2.3.16.4-SNAPSHOT jar Struts 2 Archetypes - Database Portlet diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml index 8c47dbf1c4..0bcbaf98c2 100644 --- a/archetypes/struts2-archetype-plugin/pom.xml +++ b/archetypes/struts2-archetype-plugin/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.3 + 2.3.16.4-SNAPSHOT 4.0.0 struts2-archetype-plugin - 2.3.16.3 + 2.3.16.4-SNAPSHOT jar Struts 2 Archetypes - Plugin diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml index a6be6f7cca..e2a5694e48 100644 --- a/archetypes/struts2-archetype-portlet/pom.xml +++ b/archetypes/struts2-archetype-portlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.3 + 2.3.16.4-SNAPSHOT 4.0.0 struts2-archetype-portlet - 2.3.16.3 + 2.3.16.4-SNAPSHOT jar Struts 2 Archetypes - Portlet diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml index 742e0b9e4e..c1ca6fa463 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.3.16.3 + 2.3.16.4-SNAPSHOT 4.0.0 struts2-archetype-starter - 2.3.16.3 + 2.3.16.4-SNAPSHOT jar Struts 2 Archetypes - Starter diff --git a/assembly/pom.xml b/assembly/pom.xml index 1c3c55f105..81d6d6af49 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-assembly diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 57134616f3..388cc90091 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 145034a383..2ff5746e30 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index b87e697f21..d88d60155e 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index c53059cb32..030612dea9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-core jar diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 1757de63a8..344603026a 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-cdi-plugin diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index ab09d6d464..099103297b 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-codebehind-plugin diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 2a1dacef11..7860ee3b85 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-config-browser-plugin diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index 137aed5501..792713eb05 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-convention-plugin diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index 88606e43ad..dfe0bd8ce7 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -25,7 +25,7 @@ struts2-plugins org.apache.struts - 2.3.16.3 + 2.3.16.4-SNAPSHOT 4.0.0 diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index 19033d2c30..bc6778be92 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-dwr-plugin diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 604a876ece..4854accf35 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-embeddedjsp-plugin diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index cd9c826e99..aaa29882af 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-gxp-plugin diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 605b92c6ac..3418200024 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-jasperreports-plugin diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index 611f4215ca..0291187e27 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-javatemplates-plugin diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index 395b4154f2..34a040efb7 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-jfreechart-plugin diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index 67205978e3..6c2e6eeaf7 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-jsf-plugin diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index 9daa09cfb5..6bddf8127b 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-json-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 7baff8c221..50d359a0e3 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-junit-plugin diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index e89c417c57..b755e653de 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-osgi-plugin diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index 630506509a..8b14fe540a 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-oval-plugin diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index 54fa30517f..73ae9c4c42 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-pell-multipart-plugin diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 841032b095..452845443b 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-plexus-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 7a63dd3b96..b15d61a385 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-plugins diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml index 8bf28d3ee8..a6df909504 100644 --- a/plugins/portlet-tiles/pom.xml +++ b/plugins/portlet-tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-portlet-tiles-plugin diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index e5c10571b5..825cc6c2c5 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-portlet-plugin diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 62f4e7756a..863cef407b 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,11 +26,11 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-rest-plugin - 2.3.16.3 + 2.3.16.4-SNAPSHOT Struts 2 REST Plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index b3aaf14849..9a5aaaf885 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index f5a4569dcc..99dedb62f1 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-sitemesh-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 0803160eda..6befe4f416 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-spring-plugin diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index f59047f6dc..9bf91e0b34 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-struts1-plugin diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 5f23c4e6a8..8740e8d32a 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-testng-plugin diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index b6dc52633e..a7bdfbe886 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-tiles-plugin diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml index 3361d1cd14..b612dff2ba 100644 --- a/plugins/tiles3/pom.xml +++ b/plugins/tiles3/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-tiles3-plugin diff --git a/pom.xml b/pom.xml index 1d2b7e5db2..c5fdced5e8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 struts2-parent - 2.3.16.3 + 2.3.16.4-SNAPSHOT pom Struts 2 http://struts.apache.org/ @@ -31,7 +31,7 @@ scm:git:git://git.apache.org/struts.git scm:git:https://git-wip-us.apache.org/repos/asf/struts.git http://git.apache.org/struts.git - STRUTS_2_3_16_3 + STRUTS_2_3_16_2 diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml index 710f635ec5..d2a380d73b 100644 --- a/xwork-core/pom.xml +++ b/xwork-core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.3.16.3 + 2.3.16.4-SNAPSHOT org.apache.struts.xwork From d2663cedd264a5b26bc1b12035aff7b32e138f78 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 8 May 2014 21:57:25 +0200 Subject: [PATCH 8/8] Sets correct version in poms to match actually released version --- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml | 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml | 2 +- apps/portlet/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml | 4 ++-- archetypes/struts2-archetype-starter/pom.xml | 4 ++-- assembly/pom.xml | 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml | 2 +- bundles/pom.xml | 2 +- core/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml | 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml | 2 +- plugins/oval/pom.xml | 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/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 | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 51 files changed, 60 insertions(+), 60 deletions(-) diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 99de5886ed..f56bf9002b 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-blank diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 283ccb4280..f9e0b8c926 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-jboss-blank diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index fc1307a423..b6281b1a31 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-mailreader diff --git a/apps/pom.xml b/apps/pom.xml index 5860c1829b..2da20fc6df 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-apps pom diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index 89af6b65f6..50f317b6f6 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-portlet diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index feb3290003..ed5af2905b 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-rest-showcase war - 2.3.16.4-SNAPSHOT + 2.3.16.3 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 3da8de12c7..1593d9f390 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-showcase diff --git a/archetypes/pom.xml b/archetypes/pom.xml index ac90bcb0fd..bd6f1ae40b 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-archetypes diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml index 95fc42aae6..2235e440cc 100644 --- a/archetypes/struts2-archetype-angularjs/pom.xml +++ b/archetypes/struts2-archetype-angularjs/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.4-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-angularjs - 2.3.16.4-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Angular JS diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index 0bb43219fa..c6473bd387 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.3.16.4-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-blank - 2.3.16.4-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Blank diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml index e6c912bf47..b6c34d0fcb 100644 --- a/archetypes/struts2-archetype-convention/pom.xml +++ b/archetypes/struts2-archetype-convention/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.4-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-convention - 2.3.16.4-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Blank Convention diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml index a25f8d03bf..d918d13d83 100644 --- a/archetypes/struts2-archetype-dbportlet/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.4-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-dbportlet - 2.3.16.4-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Database Portlet diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml index 0bcbaf98c2..8c47dbf1c4 100644 --- a/archetypes/struts2-archetype-plugin/pom.xml +++ b/archetypes/struts2-archetype-plugin/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.4-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-plugin - 2.3.16.4-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Plugin diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml index e2a5694e48..a6be6f7cca 100644 --- a/archetypes/struts2-archetype-portlet/pom.xml +++ b/archetypes/struts2-archetype-portlet/pom.xml @@ -2,12 +2,12 @@ org.apache.struts struts2-archetypes - 2.3.16.4-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-portlet - 2.3.16.4-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Portlet diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml index c1ca6fa463..742e0b9e4e 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.3.16.4-SNAPSHOT + 2.3.16.3 4.0.0 struts2-archetype-starter - 2.3.16.4-SNAPSHOT + 2.3.16.3 jar Struts 2 Archetypes - Starter diff --git a/assembly/pom.xml b/assembly/pom.xml index 81d6d6af49..1c3c55f105 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-assembly diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 388cc90091..57134616f3 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 2ff5746e30..145034a383 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index d88d60155e..b87e697f21 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 030612dea9..c53059cb32 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-core jar diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 344603026a..1757de63a8 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-cdi-plugin diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index 099103297b..ab09d6d464 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-codebehind-plugin diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 7860ee3b85..2a1dacef11 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-config-browser-plugin diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index 792713eb05..137aed5501 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-convention-plugin diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index dfe0bd8ce7..88606e43ad 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -25,7 +25,7 @@ struts2-plugins org.apache.struts - 2.3.16.4-SNAPSHOT + 2.3.16.3 4.0.0 diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index bc6778be92..19033d2c30 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-dwr-plugin diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 4854accf35..604a876ece 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-embeddedjsp-plugin diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index aaa29882af..cd9c826e99 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-gxp-plugin diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 3418200024..605b92c6ac 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-jasperreports-plugin diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index 0291187e27..611f4215ca 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-javatemplates-plugin diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index 34a040efb7..395b4154f2 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-jfreechart-plugin diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index 6c2e6eeaf7..67205978e3 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-jsf-plugin diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index 6bddf8127b..9daa09cfb5 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-json-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 50d359a0e3..7baff8c221 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-junit-plugin diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index b755e653de..e89c417c57 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-osgi-plugin diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index 8b14fe540a..630506509a 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-oval-plugin diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index 73ae9c4c42..54fa30517f 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-pell-multipart-plugin diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 452845443b..841032b095 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-plexus-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index b15d61a385..7a63dd3b96 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-plugins diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml index a6df909504..8bf28d3ee8 100644 --- a/plugins/portlet-tiles/pom.xml +++ b/plugins/portlet-tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-portlet-tiles-plugin diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index 825cc6c2c5..e5c10571b5 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-portlet-plugin diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 863cef407b..62f4e7756a 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,11 +26,11 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-rest-plugin - 2.3.16.4-SNAPSHOT + 2.3.16.3 Struts 2 REST Plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 9a5aaaf885..b3aaf14849 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index 99dedb62f1..f5a4569dcc 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-sitemesh-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 6befe4f416..0803160eda 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-spring-plugin diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index 9bf91e0b34..f59047f6dc 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-struts1-plugin diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 8740e8d32a..5f23c4e6a8 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-testng-plugin diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index a7bdfbe886..b6dc52633e 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-tiles-plugin diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml index b612dff2ba..3361d1cd14 100644 --- a/plugins/tiles3/pom.xml +++ b/plugins/tiles3/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-tiles3-plugin diff --git a/pom.xml b/pom.xml index 332423941a..e0af6d5492 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 struts2-parent - 2.3.16.4-SNAPSHOT + 2.3.16.3 pom Struts 2 http://struts.apache.org/ diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml index d2a380d73b..710f635ec5 100644 --- a/xwork-core/pom.xml +++ b/xwork-core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.3.16.4-SNAPSHOT + 2.3.16.3 org.apache.struts.xwork