From 6021995bfbad1cbf0e6dc16b2d3e19cf9b65011d Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 30 Mar 2015 09:51:54 +0200 Subject: [PATCH 1/6] WW-4481 Adds context to deprecations warning --- .../com/opensymphony/xwork2/ognl/SecurityMemberAccess.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java index 76973680a..eb586e573 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java @@ -63,8 +63,8 @@ public class SecurityMemberAccess extends DefaultMemberAccess { Class memberClass = member.getDeclaringClass(); if (Modifier.isStatic(member.getModifiers()) && allowStaticMethodAccess) { - if (LOG.isWarnEnabled()) { - LOG.warn("Support for accessing static methods is deprecated! Please refactor your application!"); + if (LOG.isDebugEnabled()) { + LOG.debug("Support for accessing static methods [target: #0, member: #1, property: #2] is deprecated!", target, member, propertyName); } if (!isClassExcluded(member.getDeclaringClass())) { targetClass = member.getDeclaringClass(); From 4a08f070f101dbe8a74b7ed53794d645274ee9da Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 2 Apr 2015 10:17:23 +0200 Subject: [PATCH 2/6] WW-4482 Fallbacks to non-collection evaluation for non-collection param --- .../xwork2/util/TextParseUtil.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java index a3938ef33..211d08c6c 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java @@ -212,13 +212,14 @@ public class TextParseUtil { Object result = parser.evaluate(openChars, expression, ognlEval, maxLoopCount); - XWorkConverter conv = ((Container)context.get(ActionContext.CONTAINER)).getInstance(XWorkConverter.class); - Collection resultCol; if (result instanceof Collection) { @SuppressWarnings("unchecked") Collection casted = (Collection)result; - resultCol = new ArrayList(casted.size()); + resultCol = new ArrayList(); + + XWorkConverter conv = ((Container)context.get(ActionContext.CONTAINER)).getInstance(XWorkConverter.class); + for (Object element : casted) { String stringElement = (String)conv.convertValue(context, element, String.class); if (shallBeIncluded(stringElement, excludeEmptyElements)) { @@ -229,13 +230,10 @@ public class TextParseUtil { } } } else { - resultCol = new ArrayList(1); - String stringResult = (String)conv.convertValue(context, result, String.class); - if (shallBeIncluded(stringResult, excludeEmptyElements)) { - if (evaluator != null) { - stringResult = evaluator.evaluate(stringResult).toString(); - } - resultCol.add(stringResult); + resultCol = new ArrayList(); + String resultStr = translateVariables(expression, stack, evaluator); + if (shallBeIncluded(resultStr, excludeEmptyElements)) { + resultCol.add(resultStr); } } From 4651f3750117b281c200b1f011250a11606d60c4 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 3 Apr 2015 07:16:29 +0200 Subject: [PATCH 3/6] WW-4484 Upgrades Freemarker --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4580d52ae..4d4b4067c 100644 --- a/pom.xml +++ b/pom.xml @@ -523,7 +523,7 @@ org.freemarker freemarker - 2.3.19 + 2.3.22 From f99a614d4a5f3698e44c9e385764658a9c185741 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 7 Apr 2015 09:34:13 +0200 Subject: [PATCH 4/6] Fixes problem with missing JSPs --- .../src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- .../src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml index 7fa7971ae..6485b2ce0 100644 --- a/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -45,7 +45,7 @@ - src/main/webapp/example + src/main/webapp/WEB-INF/example **/*.jsp diff --git a/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype-metadata.xml index 317879c6a..be8685b6c 100644 --- a/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -38,7 +38,7 @@ - src/main/webapp + src/main/webapp/WEB-INF **/*.jsp From d469fffed912764f7af2da861319815d088a66e8 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 7 Apr 2015 09:52:32 +0200 Subject: [PATCH 5/6] [maven-release-plugin] prepare release STRUTS_2_3_23 --- 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 | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml | 2 +- archetypes/struts2-archetype-starter/pom.xml | 2 +- assembly/pom.xml | 2 +- bom/pom.xml | 8 ++++++-- 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/java8-support/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 | 2 +- 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 +- 53 files changed, 60 insertions(+), 56 deletions(-) diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 4c6c6f685..7aecc2fcf 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.23-SNAPSHOT + 2.3.23 struts2-blank diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 4f9a3535a..6cd381324 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.23-SNAPSHOT + 2.3.23 struts2-jboss-blank diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 6081fae36..66cbe7414 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.23-SNAPSHOT + 2.3.23 struts2-mailreader diff --git a/apps/pom.xml b/apps/pom.xml index d0e67cae6..5bd047377 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.23-SNAPSHOT + 2.3.23 struts2-apps pom diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index ea5d5e730..5f55faa19 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.23-SNAPSHOT + 2.3.23 struts2-portlet diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 689a3fea9..32c44c68c 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps - 2.3.23-SNAPSHOT + 2.3.23 struts2-rest-showcase war - 2.3.23-SNAPSHOT + 2.3.23 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index af5d3a13c..04ce1dd27 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.23-SNAPSHOT + 2.3.23 struts2-showcase diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 15f5f7441..2538ce0e6 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.23-SNAPSHOT + 2.3.23 struts2-archetypes diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml index c7d039624..9bec00fcf 100644 --- a/archetypes/struts2-archetype-angularjs/pom.xml +++ b/archetypes/struts2-archetype-angularjs/pom.xml @@ -2,7 +2,7 @@ org.apache.struts struts2-archetypes - 2.3.23-SNAPSHOT + 2.3.23 4.0.0 diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index e1001f9b1..c3fed7e3b 100644 --- a/archetypes/struts2-archetype-blank/pom.xml +++ b/archetypes/struts2-archetype-blank/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-archetypes - 2.3.23-SNAPSHOT + 2.3.23 4.0.0 diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml index b5c4fe2e9..e1d6ccba0 100644 --- a/archetypes/struts2-archetype-convention/pom.xml +++ b/archetypes/struts2-archetype-convention/pom.xml @@ -2,7 +2,7 @@ org.apache.struts struts2-archetypes - 2.3.23-SNAPSHOT + 2.3.23 4.0.0 diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml index 644058737..a27cc4c88 100644 --- a/archetypes/struts2-archetype-dbportlet/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/pom.xml @@ -2,7 +2,7 @@ org.apache.struts struts2-archetypes - 2.3.23-SNAPSHOT + 2.3.23 4.0.0 diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml index ac5c2f28f..dcda0fb29 100644 --- a/archetypes/struts2-archetype-plugin/pom.xml +++ b/archetypes/struts2-archetype-plugin/pom.xml @@ -2,7 +2,7 @@ org.apache.struts struts2-archetypes - 2.3.23-SNAPSHOT + 2.3.23 4.0.0 diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml index 636851c70..ac21caba0 100644 --- a/archetypes/struts2-archetype-portlet/pom.xml +++ b/archetypes/struts2-archetype-portlet/pom.xml @@ -2,7 +2,7 @@ org.apache.struts struts2-archetypes - 2.3.23-SNAPSHOT + 2.3.23 4.0.0 diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml index 0bc0d51ad..4f2cb5b79 100644 --- a/archetypes/struts2-archetype-starter/pom.xml +++ b/archetypes/struts2-archetype-starter/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-archetypes - 2.3.23-SNAPSHOT + 2.3.23 4.0.0 diff --git a/assembly/pom.xml b/assembly/pom.xml index dbafbc90a..c64f0b971 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent - 2.3.23-SNAPSHOT + 2.3.23 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index d337af7c4..a7e6f2c92 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -10,7 +10,7 @@ struts2-bom - 2.3.23-SNAPSHOT + 2.3.23 pom Struts 2 Bill of Materials @@ -25,7 +25,7 @@ - 2.3.23-SNAPSHOT + 2.3.23 @@ -195,4 +195,8 @@ + + + STRUTS_2_3_23 + diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 9b227f3ca..de40fb2be 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.23-SNAPSHOT + 2.3.23 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 795868e56..f99f3cfd9 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.23-SNAPSHOT + 2.3.23 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 96105dbd8..8a341c577 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.23-SNAPSHOT + 2.3.23 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 7d5f9797a..247f4bd13 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.23-SNAPSHOT + 2.3.23 struts2-core jar diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 8ded08021..79f265694 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-cdi-plugin diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index 7e16f920a..96760cfe1 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-codebehind-plugin diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index ee1c98621..7e6f26597 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-config-browser-plugin diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index 9f315d7c2..cb2557b2a 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-convention-plugin diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index 5a3e1057a..3f38a4939 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -25,7 +25,7 @@ struts2-plugins org.apache.struts - 2.3.23-SNAPSHOT + 2.3.23 4.0.0 diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index 40fcd1646..5f4bb5298 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-dwr-plugin diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index d92e74038..689916d05 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-embeddedjsp-plugin diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index 9dfeb6307..f914e447a 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-gxp-plugin diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 422c1f7c2..f823ca79a 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-jasperreports-plugin diff --git a/plugins/java8-support/pom.xml b/plugins/java8-support/pom.xml index 64fca3199..a25a7a60a 100644 --- a/plugins/java8-support/pom.xml +++ b/plugins/java8-support/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-java8-support-plugin diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index 1710fe04d..df30bef9a 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-javatemplates-plugin diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index c9fd6157c..4d1d6bc43 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-jfreechart-plugin diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index e7af78599..3dc13ff3b 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-jsf-plugin diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index 223ca9b73..9a525e941 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-json-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 266a371eb..d2b5b708b 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-junit-plugin diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index 039e933cd..cc929df3d 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-osgi-plugin diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index f530ddc44..e32c404f8 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-oval-plugin diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index c77fbf63a..38a69e08e 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-pell-multipart-plugin diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 81e58324e..e26af7d0c 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-plexus-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 864a9bd19..f20b7b758 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.23-SNAPSHOT + 2.3.23 struts2-plugins diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml index 4974c12ab..f18a15a1f 100644 --- a/plugins/portlet-tiles/pom.xml +++ b/plugins/portlet-tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-portlet-tiles-plugin diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index 138617982..e6571b414 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-portlet-plugin diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 3fea8c493..abb286f46 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-rest-plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 935a4c4da..612cbd0bb 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index cee9d8f4b..a3aa3332f 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-sitemesh-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 66ce73b0e..5998da826 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-spring-plugin diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index c38035925..de777215a 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-struts1-plugin diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 76b10aa87..4093d4628 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-testng-plugin diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 312b77ace..84b42b7a0 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-tiles-plugin diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml index a21cb6e1b..2afcdfae1 100644 --- a/plugins/tiles3/pom.xml +++ b/plugins/tiles3/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23-SNAPSHOT + 2.3.23 struts2-tiles3-plugin diff --git a/pom.xml b/pom.xml index 4d4b4067c..7a8c759ee 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 struts2-parent - 2.3.23-SNAPSHOT + 2.3.23 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 - HEAD + STRUTS_2_3_23 diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml index cc48e28f5..ef4c0d208 100644 --- a/xwork-core/pom.xml +++ b/xwork-core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.3.23-SNAPSHOT + 2.3.23 org.apache.struts.xwork From a31af91199f6378a4a22134d79b05705d7d75025 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 7 Apr 2015 09:52:42 +0200 Subject: [PATCH 6/6] [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 | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml | 2 +- archetypes/struts2-archetype-starter/pom.xml | 2 +- assembly/pom.xml | 2 +- bom/pom.xml | 8 ++------ 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/java8-support/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 | 2 +- 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 +- 53 files changed, 56 insertions(+), 60 deletions(-) diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 7aecc2fcf..979f077f2 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.23 + 2.3.24-SNAPSHOT struts2-blank diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 6cd381324..17f3548d9 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.23 + 2.3.24-SNAPSHOT struts2-jboss-blank diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 66cbe7414..5d3881186 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.23 + 2.3.24-SNAPSHOT struts2-mailreader diff --git a/apps/pom.xml b/apps/pom.xml index 5bd047377..4971cd47e 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.23 + 2.3.24-SNAPSHOT struts2-apps pom diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index 5f55faa19..74b015f53 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.23 + 2.3.24-SNAPSHOT struts2-portlet diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 32c44c68c..8919e6303 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps - 2.3.23 + 2.3.24-SNAPSHOT struts2-rest-showcase war - 2.3.23 + 2.3.24-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 04ce1dd27..f7aa11b6f 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.23 + 2.3.24-SNAPSHOT struts2-showcase diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 2538ce0e6..90d15ad77 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.23 + 2.3.24-SNAPSHOT struts2-archetypes diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml index 9bec00fcf..e06a48a3e 100644 --- a/archetypes/struts2-archetype-angularjs/pom.xml +++ b/archetypes/struts2-archetype-angularjs/pom.xml @@ -2,7 +2,7 @@ org.apache.struts struts2-archetypes - 2.3.23 + 2.3.24-SNAPSHOT 4.0.0 diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index c3fed7e3b..444f8c8eb 100644 --- a/archetypes/struts2-archetype-blank/pom.xml +++ b/archetypes/struts2-archetype-blank/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-archetypes - 2.3.23 + 2.3.24-SNAPSHOT 4.0.0 diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml index e1d6ccba0..087042b6d 100644 --- a/archetypes/struts2-archetype-convention/pom.xml +++ b/archetypes/struts2-archetype-convention/pom.xml @@ -2,7 +2,7 @@ org.apache.struts struts2-archetypes - 2.3.23 + 2.3.24-SNAPSHOT 4.0.0 diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml index a27cc4c88..a87a37dac 100644 --- a/archetypes/struts2-archetype-dbportlet/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/pom.xml @@ -2,7 +2,7 @@ org.apache.struts struts2-archetypes - 2.3.23 + 2.3.24-SNAPSHOT 4.0.0 diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml index dcda0fb29..266dec51a 100644 --- a/archetypes/struts2-archetype-plugin/pom.xml +++ b/archetypes/struts2-archetype-plugin/pom.xml @@ -2,7 +2,7 @@ org.apache.struts struts2-archetypes - 2.3.23 + 2.3.24-SNAPSHOT 4.0.0 diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml index ac21caba0..d616c9bd9 100644 --- a/archetypes/struts2-archetype-portlet/pom.xml +++ b/archetypes/struts2-archetype-portlet/pom.xml @@ -2,7 +2,7 @@ org.apache.struts struts2-archetypes - 2.3.23 + 2.3.24-SNAPSHOT 4.0.0 diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml index 4f2cb5b79..392dbc075 100644 --- a/archetypes/struts2-archetype-starter/pom.xml +++ b/archetypes/struts2-archetype-starter/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-archetypes - 2.3.23 + 2.3.24-SNAPSHOT 4.0.0 diff --git a/assembly/pom.xml b/assembly/pom.xml index c64f0b971..211259f78 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent - 2.3.23 + 2.3.24-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index a7e6f2c92..bb4aeabf1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -10,7 +10,7 @@ struts2-bom - 2.3.23 + 2.3.24-SNAPSHOT pom Struts 2 Bill of Materials @@ -25,7 +25,7 @@ - 2.3.23 + 2.3.24-SNAPSHOT @@ -195,8 +195,4 @@ - - - STRUTS_2_3_23 - diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index de40fb2be..d5e64cd16 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.23 + 2.3.24-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index f99f3cfd9..56067f151 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.23 + 2.3.24-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 8a341c577..5c8800289 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.23 + 2.3.24-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 247f4bd13..781a73c15 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.23 + 2.3.24-SNAPSHOT struts2-core jar diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 79f265694..71a47b639 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-cdi-plugin diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index 96760cfe1..a016d81a7 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-codebehind-plugin diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 7e6f26597..8b4ae168e 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-config-browser-plugin diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index cb2557b2a..41b675a44 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-convention-plugin diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index 3f38a4939..6dd76c55b 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -25,7 +25,7 @@ struts2-plugins org.apache.struts - 2.3.23 + 2.3.24-SNAPSHOT 4.0.0 diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index 5f4bb5298..98b62c835 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-dwr-plugin diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 689916d05..17a0cfb15 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-embeddedjsp-plugin diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index f914e447a..13aa7ca46 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-gxp-plugin diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index f823ca79a..e66bb6b53 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-jasperreports-plugin diff --git a/plugins/java8-support/pom.xml b/plugins/java8-support/pom.xml index a25a7a60a..af04c0c50 100644 --- a/plugins/java8-support/pom.xml +++ b/plugins/java8-support/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-java8-support-plugin diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index df30bef9a..4c741d081 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-javatemplates-plugin diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index 4d1d6bc43..7e2f93a53 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-jfreechart-plugin diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index 3dc13ff3b..dc7b8c434 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-jsf-plugin diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index 9a525e941..8f63ccb22 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-json-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index d2b5b708b..cf40be3d3 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-junit-plugin diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index cc929df3d..72fded3b5 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-osgi-plugin diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index e32c404f8..ae45fe11a 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-oval-plugin diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index 38a69e08e..045231c48 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-pell-multipart-plugin diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index e26af7d0c..617999eff 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-plexus-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index f20b7b758..4d02f18a9 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.23 + 2.3.24-SNAPSHOT struts2-plugins diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml index f18a15a1f..b1c0d6005 100644 --- a/plugins/portlet-tiles/pom.xml +++ b/plugins/portlet-tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-portlet-tiles-plugin diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index e6571b414..96211975a 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-portlet-plugin diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index abb286f46..9a2d7d454 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-rest-plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 612cbd0bb..5d7d4f75e 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index a3aa3332f..f80dbf3b5 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-sitemesh-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 5998da826..fe437abf6 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-spring-plugin diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index de777215a..6270d0c7e 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-struts1-plugin diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 4093d4628..e08a1c913 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-testng-plugin diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 84b42b7a0..1e7d464d9 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-tiles-plugin diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml index 2afcdfae1..b0ceb4074 100644 --- a/plugins/tiles3/pom.xml +++ b/plugins/tiles3/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.23 + 2.3.24-SNAPSHOT struts2-tiles3-plugin diff --git a/pom.xml b/pom.xml index 7a8c759ee..fc2121cab 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 struts2-parent - 2.3.23 + 2.3.24-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_23 + HEAD diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml index ef4c0d208..07bb5cebe 100644 --- a/xwork-core/pom.xml +++ b/xwork-core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.3.23 + 2.3.24-SNAPSHOT org.apache.struts.xwork