struts git commit: Uses default error key if specified key doesn't exist

2017-03-06 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master f487d7e7d -> 6b8272ce4


Uses default error key if specified key doesn't exist


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6b8272ce
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6b8272ce
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6b8272ce

Branch: refs/heads/master
Commit: 6b8272ce47160036ed120a48345d9aa884477228
Parents: f487d7e
Author: Lukasz Lenart 
Authored: Mon Mar 6 11:17:38 2017 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 6 14:45:26 2017 +0100

--
 .../struts2/interceptor/FileUploadInterceptor.java | 13 -
 .../struts2/interceptor/FileUploadInterceptorTest.java |  8 
 2 files changed, 12 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/6b8272ce/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java 
b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
index b9f5cb6..aa7fe01 100644
--- 
a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ 
b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
@@ -26,7 +26,6 @@ import com.opensymphony.xwork2.inject.Container;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 import com.opensymphony.xwork2.interceptor.ValidationAware;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import com.opensymphony.xwork2.util.TextParseUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -38,7 +37,6 @@ import org.apache.struts2.dispatcher.multipart.UploadedFile;
 import org.apache.struts2.util.ContentTypeMatcher;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
 import java.text.NumberFormat;
 import java.util.*;
 
@@ -258,11 +256,16 @@ public class FileUploadInterceptor extends 
AbstractInterceptor {
 
 MultiPartRequestWrapper multiWrapper = (MultiPartRequestWrapper) 
request;
 
-if (multiWrapper.hasErrors()) {
+if (multiWrapper.hasErrors() && validation != null) {
+TextProvider textProvider = getTextProvider(action);
 for (LocalizedMessage error : multiWrapper.getErrors()) {
-if (validation != null) {
-
validation.addActionError(LocalizedTextUtil.findText(error.getClazz(), 
error.getTextKey(), ActionContext.getContext().getLocale(), 
error.getDefaultMessage(), error.getArgs()));
+String errorMessage;
+if (textProvider.hasKey(error.getTextKey())) {
+errorMessage = textProvider.getText(error.getTextKey(), 
Arrays.asList(error.getArgs()));
+} else {
+errorMessage = 
textProvider.getText("struts.messages.error.uploading", 
error.getDefaultMessage());
 }
+validation.addActionError(errorMessage);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/struts/blob/6b8272ce/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
--
diff --git 
a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
 
b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
index 0224f68..8e68cef 100644
--- 
a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
+++ 
b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
@@ -231,7 +231,7 @@ public class FileUploadInterceptorTest extends 
StrutsInternalTestCase {
 req.setContentType("text/xml"); // not a multipart contentype
 req.addHeader("Content-type", "multipart/form-data");
 
-MyFileupAction action = new MyFileupAction();
+MyFileupAction action = container.inject(MyFileupAction.class);
 MockActionInvocation mai = new MockActionInvocation();
 mai.setAction(action);
 mai.setResultCode("success");
@@ -252,7 +252,7 @@ public class FileUploadInterceptorTest extends 
StrutsInternalTestCase {
 req.addHeader("Content-type", "multipart/form-data");
 req.setContent(null); // there is no content
 
-MyFileupAction action = new MyFileupAction();
+MyFileupAction action = container.inject(MyFileupAction.class);
 MockActionInvocation mai = new MockActionInvocation();
 mai.setAction(action);
 mai.setResultCode("success");
@@ -386,7 +386,7 @@

[struts] Git Push Summary

2017-03-06 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/struts-2-5-10-1 [deleted] 6eeeb223a

svn commit: r18565 - /dev/struts/2.3.32/

2017-03-06 Thread lukaszlenart 
Author: lukaszlenart
Date: Mon Mar  6 11:56:37 2017
New Revision: 18565

Log:
Updates test release 2.3.32

Added:
dev/struts/2.3.32/
dev/struts/2.3.32/struts-2.3.32-all.zip   (with props)
dev/struts/2.3.32/struts-2.3.32-all.zip.asc   (with props)
dev/struts/2.3.32/struts-2.3.32-all.zip.md5
dev/struts/2.3.32/struts-2.3.32-all.zip.sha1
dev/struts/2.3.32/struts-2.3.32-apps.zip   (with props)
dev/struts/2.3.32/struts-2.3.32-apps.zip.asc   (with props)
dev/struts/2.3.32/struts-2.3.32-apps.zip.md5
dev/struts/2.3.32/struts-2.3.32-apps.zip.sha1
dev/struts/2.3.32/struts-2.3.32-docs.zip   (with props)
dev/struts/2.3.32/struts-2.3.32-docs.zip.asc   (with props)
dev/struts/2.3.32/struts-2.3.32-docs.zip.md5
dev/struts/2.3.32/struts-2.3.32-docs.zip.sha1
dev/struts/2.3.32/struts-2.3.32-lib.zip   (with props)
dev/struts/2.3.32/struts-2.3.32-lib.zip.asc   (with props)
dev/struts/2.3.32/struts-2.3.32-lib.zip.md5
dev/struts/2.3.32/struts-2.3.32-lib.zip.sha1
dev/struts/2.3.32/struts-2.3.32-min-lib.zip   (with props)
dev/struts/2.3.32/struts-2.3.32-min-lib.zip.asc   (with props)
dev/struts/2.3.32/struts-2.3.32-min-lib.zip.md5
dev/struts/2.3.32/struts-2.3.32-min-lib.zip.sha1
dev/struts/2.3.32/struts-2.3.32-src.zip   (with props)
dev/struts/2.3.32/struts-2.3.32-src.zip.asc   (with props)
dev/struts/2.3.32/struts-2.3.32-src.zip.md5
dev/struts/2.3.32/struts-2.3.32-src.zip.sha1

Added: dev/struts/2.3.32/struts-2.3.32-all.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.3.32/struts-2.3.32-all.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.3.32/struts-2.3.32-all.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.3.32/struts-2.3.32-all.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.3.32/struts-2.3.32-all.zip.md5
==
--- dev/struts/2.3.32/struts-2.3.32-all.zip.md5 (added)
+++ dev/struts/2.3.32/struts-2.3.32-all.zip.md5 Mon Mar  6 11:56:37 2017
@@ -0,0 +1 @@
+287ca80b40e99b487e3ad502f8590c4e
\ No newline at end of file

Added: dev/struts/2.3.32/struts-2.3.32-all.zip.sha1
==
--- dev/struts/2.3.32/struts-2.3.32-all.zip.sha1 (added)
+++ dev/struts/2.3.32/struts-2.3.32-all.zip.sha1 Mon Mar  6 11:56:37 2017
@@ -0,0 +1 @@
+b2dd28cb8b55abd9281a583cb9377866d8b9c374
\ No newline at end of file

Added: dev/struts/2.3.32/struts-2.3.32-apps.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.3.32/struts-2.3.32-apps.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.3.32/struts-2.3.32-apps.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.3.32/struts-2.3.32-apps.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.3.32/struts-2.3.32-apps.zip.md5
==
--- dev/struts/2.3.32/struts-2.3.32-apps.zip.md5 (added)
+++ dev/struts/2.3.32/struts-2.3.32-apps.zip.md5 Mon Mar  6 11:56:37 2017
@@ -0,0 +1 @@
+55729ccea025a7f59599332d515d4f7e
\ No newline at end of file

Added: dev/struts/2.3.32/struts-2.3.32-apps.zip.sha1
==
--- dev/struts/2.3.32/struts-2.3.32-apps.zip.sha1 (added)
+++ dev/struts/2.3.32/struts-2.3.32-apps.zip.sha1 Mon Mar  6 11:56:37 2017
@@ -0,0 +1 @@
+fa7d8dcfa06e338f0da779b6095313b19f9c51ef
\ No newline at end of file

Added: dev/struts/2.3.32/struts-2.3.32-docs.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.3.32/struts-2.3.32-docs.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.3.32/struts-2.3.32-docs.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.3.32/struts-2.3.32-docs.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.3.32/struts-2.3.32-docs.zip.md5

[1/2] struts git commit: Uses default error key if specified key doesn't exist

2017-03-06 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/support-2-3 54dff362f -> 1ed29d508


Uses default error key if specified key doesn't exist


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/35230649
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/35230649
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/35230649

Branch: refs/heads/support-2-3
Commit: 352306493971e7d5a756d61780d57a76eb1f519a
Parents: 54dff36
Author: Lukasz Lenart 
Authored: Mon Mar 6 11:56:39 2017 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 6 11:56:39 2017 +0100

--
 .../struts2/dispatcher/multipart/JakartaMultiPartRequest.java  | 6 +-
 .../dispatcher/multipart/JakartaStreamMultiPartRequest.java| 6 +-
 .../struts2/dispatcher/multipart/MultiPartRequestWrapper.java  | 6 +-
 3 files changed, 15 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/35230649/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
index eecec0e..8f3592b 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
@@ -120,7 +120,11 @@ public class JakartaMultiPartRequest implements 
MultiPartRequest {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Preparing error message for key: [#0]", errorKey);
 }
-return LocalizedTextUtil.findText(this.getClass(), errorKey, 
defaultLocale, e.getMessage(), args);
+if (LocalizedTextUtil.findText(this.getClass(), errorKey, 
defaultLocale, null, new Object[0]) == null) {
+return LocalizedTextUtil.findText(this.getClass(), 
"struts.messages.error.uploading", defaultLocale, null, new Object[] { 
e.getMessage() });
+} else {
+return LocalizedTextUtil.findText(this.getClass(), errorKey, 
defaultLocale, null, args);
+}
 }
 
 protected void processUpload(HttpServletRequest request, String saveDir) 
throws FileUploadException, UnsupportedEncodingException {

http://git-wip-us.apache.org/repos/asf/struts/blob/35230649/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
index e22cee3..b230556 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
@@ -539,7 +539,11 @@ public class JakartaStreamMultiPartRequest implements 
MultiPartRequest {
 String errorKey = "struts.message.upload.error." + 
e.getClass().getSimpleName();
 if (LOG.isDebugEnabled())
 LOG.debug("Preparing error message for key: [#0]", errorKey);
-return LocalizedTextUtil.findText(this.getClass(), errorKey, 
defaultLocale, e.getMessage(), args);
+if (LocalizedTextUtil.findText(this.getClass(), errorKey, 
defaultLocale, null, new Object[0]) == null) {
+return LocalizedTextUtil.findText(this.getClass(), 
"struts.messages.error.uploading", defaultLocale, null, new Object[] { 
e.getMessage() });
+} else {
+return LocalizedTextUtil.findText(this.getClass(), errorKey, 
defaultLocale, null, args);
+}
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/struts/blob/35230649/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
index ddc4275..997c224 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
@@ -108,7 +108,11 @@ public class MultiPartRequestWrapper extends 
StrutsRequestWrapper {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Preparing error message for key: [#0]", errorKey);
 }
-return

[2/2] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_32

2017-03-06 Thread lukaszlenart 
[maven-release-plugin] prepare release STRUTS_2_3_32


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1ed29d50
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1ed29d50
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1ed29d50

Branch: refs/heads/support-2-3
Commit: 1ed29d508fc0a3762ad7d16336a71adcf69bd88d
Parents: 3523064
Author: Lukasz Lenart 
Authored: Mon Mar 6 12:03:06 2017 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 6 12:03:06 2017 +0100

--
 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 | 6 +++---
 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, 57 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/1ed29d50/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index cf71c0d..6c74a07 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.32-SNAPSHOT
+2.3.32
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/1ed29d50/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 12df2d1..6077dee 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.32-SNAPSHOT
+2.3.32
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/1ed29d50/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index f5721b6..87ac8c2 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@

struts git commit: [maven-release-plugin] prepare for next development iteration

2017-03-06 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/support-2-3 1ed29d508 -> 4d888a5ab


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4d888a5a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4d888a5a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4d888a5a

Branch: refs/heads/support-2-3
Commit: 4d888a5ab6318288a771bacfdc879ee16270d937
Parents: 1ed29d5
Author: Lukasz Lenart 
Authored: Mon Mar 6 12:03:18 2017 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 6 12:03:18 2017 +0100

--
 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 | 6 +++---
 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, 57 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/4d888a5a/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 6c74a07..b6c696b 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.32
+2.3.33-SNAPSHOT
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/4d888a5a/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 6077dee..a04e1b5 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.32
+2.3.33-SNAPSHOT
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/4d888a5a/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 87ac8c2..57b8704 100644

[struts] Git Push Summary

2017-03-06 Thread lukaszlenart 
Repository: struts
Updated Tags:  refs/tags/STRUTS_2_3_32 [created] 15540632d

svn commit: r18564 - /dev/struts/2.5.10.1/

2017-03-06 Thread lukaszlenart 
Author: lukaszlenart
Date: Mon Mar  6 10:48:54 2017
New Revision: 18564

Log:
Updates test release 2.5.10.1

Added:
dev/struts/2.5.10.1/
dev/struts/2.5.10.1/struts-2.5.10.1-all.zip   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-all.zip.asc   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-all.zip.md5
dev/struts/2.5.10.1/struts-2.5.10.1-all.zip.sha1
dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip.asc   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip.md5
dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip.sha1
dev/struts/2.5.10.1/struts-2.5.10.1-docs.zip   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-docs.zip.asc   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-docs.zip.md5
dev/struts/2.5.10.1/struts-2.5.10.1-docs.zip.sha1
dev/struts/2.5.10.1/struts-2.5.10.1-lib.zip   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-lib.zip.asc   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-lib.zip.md5
dev/struts/2.5.10.1/struts-2.5.10.1-lib.zip.sha1
dev/struts/2.5.10.1/struts-2.5.10.1-min-lib.zip   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-min-lib.zip.asc   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-min-lib.zip.md5
dev/struts/2.5.10.1/struts-2.5.10.1-min-lib.zip.sha1
dev/struts/2.5.10.1/struts-2.5.10.1-src.zip   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-src.zip.asc   (with props)
dev/struts/2.5.10.1/struts-2.5.10.1-src.zip.md5
dev/struts/2.5.10.1/struts-2.5.10.1-src.zip.sha1

Added: dev/struts/2.5.10.1/struts-2.5.10.1-all.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5.10.1/struts-2.5.10.1-all.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5.10.1/struts-2.5.10.1-all.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5.10.1/struts-2.5.10.1-all.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.5.10.1/struts-2.5.10.1-all.zip.md5
==
--- dev/struts/2.5.10.1/struts-2.5.10.1-all.zip.md5 (added)
+++ dev/struts/2.5.10.1/struts-2.5.10.1-all.zip.md5 Mon Mar  6 10:48:54 2017
@@ -0,0 +1 @@
+002fc65819d1489e15f2680d9c800a73
\ No newline at end of file

Added: dev/struts/2.5.10.1/struts-2.5.10.1-all.zip.sha1
==
--- dev/struts/2.5.10.1/struts-2.5.10.1-all.zip.sha1 (added)
+++ dev/struts/2.5.10.1/struts-2.5.10.1-all.zip.sha1 Mon Mar  6 10:48:54 2017
@@ -0,0 +1 @@
+dfcdcb377c43a277dbbf5369448e3082b69c64ed
\ No newline at end of file

Added: dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip.md5
==
--- dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip.md5 (added)
+++ dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip.md5 Mon Mar  6 10:48:54 2017
@@ -0,0 +1 @@
+a4cb4886c1cdc10d6bbd72b3df17d146
\ No newline at end of file

Added: dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip.sha1
==
--- dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip.sha1 (added)
+++ dev/struts/2.5.10.1/struts-2.5.10.1-apps.zip.sha1 Mon Mar  6 10:48:54 2017
@@ -0,0 +1 @@
+f0c9cc80b5c8af8ceef56517895981619fd4d95c
\ No newline at end of file

Added: dev/struts/2.5.10.1/struts-2.5.10.1-docs.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5.10.1/struts-2.5.10.1-docs.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5.10.1/struts-2.5.10.1-docs.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5.10.1/struts-2.5.10.1-docs.zip.asc

struts git commit: [maven-release-plugin] prepare for next development iteration

2017-03-06 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/struts-2-5-10-1 376a891ae -> 6eeeb223a


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6eeeb223
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6eeeb223
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6eeeb223

Branch: refs/heads/struts-2-5-10-1
Commit: 6eeeb223a2d7004591c14af40529519011437e9c
Parents: 376a891
Author: Lukasz Lenart 
Authored: Mon Mar 6 11:26:57 2017 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 6 11:26:57 2017 +0100

--
 apps/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 6 +++---
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/bean-validation/pom.xml | 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/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/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/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 pom.xml | 4 ++--
 35 files changed, 39 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/6eeeb223/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index 4d95a0e..1e1de80 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.10.1
+2.5.10.2-SNAPSHOT
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/6eeeb223/apps/rest-showcase/pom.xml
--
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 57115eb..c2a99cf 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
 
 org.apache.struts
 struts2-apps
-2.5.10.1
+2.5.10.2-SNAPSHOT
 
 
 struts2-rest-showcase
 war
-2.5.10.1
+2.5.10.2-SNAPSHOT
 Struts 2 Rest Showcase Webapp
 Struts 2 Rest Showcase Example
 

http://git-wip-us.apache.org/repos/asf/struts/blob/6eeeb223/apps/showcase/pom.xml
--
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 7f3ebfd..5adacc6 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.5.10.1
+2.5.10.2-SNAPSHOT
 
 
 struts2-showcase

http://git-wip-us.apache.org/repos/asf/struts/blob/6eeeb223/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0ced847..e335d6a 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.10.1
+2.5.10.2-SNAPSHOT
 
 
 struts2-assembly

http://git-wip-us.apache.org/repos/asf/struts/blob/6eeeb223/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index 20165e0..ecca8be 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
 
 
 struts2-bom
-2.5.10.1
+2.5.10.2-SNAPSHOT
 pom
 
 Struts 2 Bill of Materials
@@ -25,7 +25,7 @@
 
 
 
-2.5.10.1
+2.5.10.2-SNAPSHOT
 
 
 
@@ -172,6 +172,6 @@
 
 
   
-STRUTS_2_5_10_1
+STRUTS_2_5_10
   
 

http://git-wip-us.apache.org/repos/asf/struts/blob/6eeeb223/bundles/admin/pom.xml
--
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index d3fd66b..cb526c7 100644
--- a/bundles/admin/pom.xml
+++

[struts] Git Push Summary

2017-03-06 Thread lukaszlenart 
Repository: struts
Updated Tags:  refs/tags/STRUTS_2_5_10_1 [created] dffedae3a

[2/3] struts git commit: Sets version to SNAPSHOT

2017-03-06 Thread lukaszlenart 
Sets version to SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b5a5bbb0
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b5a5bbb0
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b5a5bbb0

Branch: refs/heads/struts-2-5-10-1
Commit: b5a5bbb031f0148b8d03dc607c5155ac1d4b76f5
Parents: b06dd50
Author: Lukasz Lenart 
Authored: Mon Mar 6 11:19:23 2017 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 6 11:19:23 2017 +0100

--
 apps/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 4 ++--
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/bean-validation/pom.xml | 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/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/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/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 pom.xml | 2 +-
 35 files changed, 37 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/b5a5bbb0/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index 766f91c..64d9b76 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.10
+2.5.10.1-SNAPSHOT
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/b5a5bbb0/apps/rest-showcase/pom.xml
--
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index ef4c43f..b49d000 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
 
 org.apache.struts
 struts2-apps
-2.5.10
+2.5.10.1-SNAPSHOT
 
 
 struts2-rest-showcase
 war
-2.5.10
+2.5.10.1-SNAPSHOT
 Struts 2 Rest Showcase Webapp
 Struts 2 Rest Showcase Example
 

http://git-wip-us.apache.org/repos/asf/struts/blob/b5a5bbb0/apps/showcase/pom.xml
--
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 1daed25..3ee1acf 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.5.10
+2.5.10.1-SNAPSHOT
 
 
 struts2-showcase

http://git-wip-us.apache.org/repos/asf/struts/blob/b5a5bbb0/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0b576c6..3228e9b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.10
+2.5.10.1-SNAPSHOT
 
 
 struts2-assembly

http://git-wip-us.apache.org/repos/asf/struts/blob/b5a5bbb0/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index e53048b..93cda6a 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
 
 
 struts2-bom
-2.5.10
+2.5.10.1-SNAPSHOT
 pom
 
 Struts 2 Bill of Materials
@@ -25,7 +25,7 @@
 
 
 
-2.5.10
+2.5.10.1-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/b5a5bbb0/bundles/admin/pom.xml
--
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index c3d5b07..426499d 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
 
 org.apache.struts
 struts2-osgi-bundles
-2.5.10
+2.5.10.1-SNAPSHOT
 
 
 struts2-osgi-admin-bundle

[1/3] struts git commit: Uses default error key if specified key doesn't exist

2017-03-06 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/struts-2-5-10-1 [created] 376a891ae


Uses default error key if specified key doesn't exist


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b06dd50a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b06dd50a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b06dd50a

Branch: refs/heads/struts-2-5-10-1
Commit: b06dd50af2a3319dd896bf5c2f4972d2b772cf2b
Parents: f0f4e9e
Author: Lukasz Lenart 
Authored: Mon Mar 6 11:17:38 2017 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 6 11:17:38 2017 +0100

--
 .../struts2/interceptor/FileUploadInterceptor.java | 13 -
 .../struts2/interceptor/FileUploadInterceptorTest.java |  8 
 2 files changed, 12 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/b06dd50a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java 
b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
index b9f5cb6..aa7fe01 100644
--- 
a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ 
b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
@@ -26,7 +26,6 @@ import com.opensymphony.xwork2.inject.Container;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 import com.opensymphony.xwork2.interceptor.ValidationAware;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import com.opensymphony.xwork2.util.TextParseUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -38,7 +37,6 @@ import org.apache.struts2.dispatcher.multipart.UploadedFile;
 import org.apache.struts2.util.ContentTypeMatcher;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
 import java.text.NumberFormat;
 import java.util.*;
 
@@ -258,11 +256,16 @@ public class FileUploadInterceptor extends 
AbstractInterceptor {
 
 MultiPartRequestWrapper multiWrapper = (MultiPartRequestWrapper) 
request;
 
-if (multiWrapper.hasErrors()) {
+if (multiWrapper.hasErrors() && validation != null) {
+TextProvider textProvider = getTextProvider(action);
 for (LocalizedMessage error : multiWrapper.getErrors()) {
-if (validation != null) {
-
validation.addActionError(LocalizedTextUtil.findText(error.getClazz(), 
error.getTextKey(), ActionContext.getContext().getLocale(), 
error.getDefaultMessage(), error.getArgs()));
+String errorMessage;
+if (textProvider.hasKey(error.getTextKey())) {
+errorMessage = textProvider.getText(error.getTextKey(), 
Arrays.asList(error.getArgs()));
+} else {
+errorMessage = 
textProvider.getText("struts.messages.error.uploading", 
error.getDefaultMessage());
 }
+validation.addActionError(errorMessage);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/struts/blob/b06dd50a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
--
diff --git 
a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
 
b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
index 0224f68..8e68cef 100644
--- 
a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
+++ 
b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
@@ -231,7 +231,7 @@ public class FileUploadInterceptorTest extends 
StrutsInternalTestCase {
 req.setContentType("text/xml"); // not a multipart contentype
 req.addHeader("Content-type", "multipart/form-data");
 
-MyFileupAction action = new MyFileupAction();
+MyFileupAction action = container.inject(MyFileupAction.class);
 MockActionInvocation mai = new MockActionInvocation();
 mai.setAction(action);
 mai.setResultCode("success");
@@ -252,7 +252,7 @@ public class FileUploadInterceptorTest extends 
StrutsInternalTestCase {
 req.addHeader("Content-type", "multipart/form-data");
 req.setContent(null); // there is no content
 
-MyFileupAction action = new MyFileupAction();
+MyFileupAction action = container.inject(MyFileupAction.class);
 MockActionInvocation mai = new MockActionInvocation();
 mai.setAction(action);
 mai.setResultCode("success");
@@

[3/3] struts git commit: [maven-release-plugin] prepare release STRUTS_2_5_10_1

2017-03-06 Thread lukaszlenart 
[maven-release-plugin] prepare release STRUTS_2_5_10_1


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/376a891a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/376a891a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/376a891a

Branch: refs/heads/struts-2-5-10-1
Commit: 376a891aeed6157d5621f9a9101d91be60f57b01
Parents: b5a5bbb
Author: Lukasz Lenart 
Authored: Mon Mar 6 11:26:35 2017 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 6 11:26:35 2017 +0100

--
 apps/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 6 +++---
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/bean-validation/pom.xml | 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/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/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/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 pom.xml | 4 ++--
 35 files changed, 39 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/376a891a/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index 64d9b76..4d95a0e 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.10.1-SNAPSHOT
+2.5.10.1
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/376a891a/apps/rest-showcase/pom.xml
--
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index b49d000..57115eb 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
 
 org.apache.struts
 struts2-apps
-2.5.10.1-SNAPSHOT
+2.5.10.1
 
 
 struts2-rest-showcase
 war
-2.5.10.1-SNAPSHOT
+2.5.10.1
 Struts 2 Rest Showcase Webapp
 Struts 2 Rest Showcase Example
 

http://git-wip-us.apache.org/repos/asf/struts/blob/376a891a/apps/showcase/pom.xml
--
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 3ee1acf..7f3ebfd 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.5.10.1-SNAPSHOT
+2.5.10.1
 
 
 struts2-showcase

http://git-wip-us.apache.org/repos/asf/struts/blob/376a891a/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3228e9b..0ced847 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.10.1-SNAPSHOT
+2.5.10.1
 
 
 struts2-assembly

http://git-wip-us.apache.org/repos/asf/struts/blob/376a891a/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index 93cda6a..20165e0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
 
 
 struts2-bom
-2.5.10.1-SNAPSHOT
+2.5.10.1
 pom
 
 Struts 2 Bill of Materials
@@ -25,7 +25,7 @@
 
 
 
-2.5.10.1-SNAPSHOT
+2.5.10.1
 
 
 
@@ -172,6 +172,6 @@
 
 
   
-STRUTS_2_5_10
+STRUTS_2_5_10_1
   
 

http://git-wip-us.apache.org/repos/asf/struts/blob/376a891a/bundles/admin/pom.xml
--
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 426499d..d3fd66b 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
 
 org.apache.struts
 struts2-osgi-bundles