Merge remote-tracking branch 'upstream/master' into upgrade-tiles-plugin
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e56d8b2e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e56d8b2e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e56d8b2e
Branch: refs/heads/master
Commit: e56d8b2e072f59cf14c590a614e9dfdde10162ad
Parents: 33edfff 460faa3
Author: Lukasz Lenart <lukasz.len...@gmail.com>
Authored: Tue Jan 12 10:42:04 2016 +0100
Committer: Lukasz Lenart <lukasz.len...@gmail.com>
Committed: Tue Jan 12 10:42:04 2016 +0100
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/view/helloWorld.vm | 2 +-
apps/portlet/src/main/webapp/tiles/footer.ftl | 2 +-
apps/portlet/src/main/webapp/tiles/footer.jsp | 2 +-
apps/portlet/src/main/webapp/tiles/index.jsp | 2 +-
.../webapp/WEB-INF/empmanager/editSkill.jsp | 6 +--
.../webapp/WEB-INF/hangman/hangmanNonAjax.ftl | 52 ++++++++++----------
.../hangman/updateCharacterAvailable.ftl | 24 ++++-----
.../webapp/WEB-INF/hangman/updateGuessLeft.ftl | 4 +-
.../webapp/WEB-INF/hangman/updateScaffold.ftl | 4 +-
.../WEB-INF/hangman/updateVocabCharacters.ftl | 12 ++---
.../main/webapp/WEB-INF/person/edit-person.jsp | 6 +--
.../main/webapp/WEB-INF/person/list-people.ftl | 6 +--
.../main/webapp/WEB-INF/person/new-person.ftl | 6 +--
.../non-ui/actionPrefix/actionPrefixExample.ftl | 2 +-
.../iteratorTag/appendIteratorTagDemoResult.jsp | 2 +-
.../main/webapp/WEB-INF/example/HelloWorld.jsp | 4 +-
.../src/main/webapp/WEB-INF/content/hello.jsp | 4 +-
.../src/main/webapp/WEB-INF/view/index.jsp | 2 +-
assembly/pom.xml | 6 +++
assembly/src/main/assembly/all.xml | 5 +-
assembly/src/main/assembly/apps.xml | 5 +-
assembly/src/main/assembly/docs.xml | 4 +-
assembly/src/main/assembly/lib.xml | 5 +-
assembly/src/main/assembly/min-lib.xml | 49 ++++++++++++++++++
assembly/src/main/assembly/src.xml | 5 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 8 +--
.../xwork2/ognl/OgnlValueStack.java | 12 ++---
.../DefaultExcludedPatternsChecker.java | 1 +
.../xwork2/util/AnnotationUtils.java | 10 ++--
.../opensymphony/xwork2/util/CompoundRoot.java | 9 ++--
.../validator/validators/EmailValidator.java | 2 +-
.../struts2/components/IteratorComponent.java | 2 +-
.../JakartaStreamMultiPartRequest.java | 10 ++++
.../apache/struts2/result/PostbackResult.java | 5 ++
.../resources/template/simple/doubleselect.ftl | 2 +-
.../providers/XmlConfigurationProviderTest.java | 16 ++++++
.../interceptor/ParametersInterceptorTest.java | 9 ++--
.../components/IteratorComponentTest.java | 38 ++++++++++++++
.../providers/xwork-test-include-wildcard.xml | 8 +++
.../resources/config-browser/actionNames.ftl | 2 +-
.../resources/config-browser/page-header.ftl | 8 +--
.../resources/config-browser/showConfig.ftl | 2 +-
.../resources/config-browser/tigris-macros.ftl | 2 +-
plugins/jasperreports/pom.xml | 4 +-
.../jasperreports/JasperReportsResult.java | 8 ++-
.../org/apache/struts2/json/JSONReader.java | 15 ++++--
.../org/apache/struts2/json/JSONResult.java | 2 +-
.../org/apache/struts2/json/JSONResultTest.java | 24 ++++-----
.../struts2/rest/DefaultHttpHeadersTest.java | 16 ++++--
pom.xml | 4 +-
50 files changed, 304 insertions(+), 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/e56d8b2e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 14360e4,862630b..1e0f708
--- a/pom.xml
+++ b/pom.xml
@@@ -85,12 -85,11 +85,12 @@@
<properties>
<currentVersion>${project.version}</currentVersion>
<struts2.springPlatformVersion>4.1.6.RELEASE</struts2.springPlatformVersion>
- <ognl.version>3.1.1</ognl.version>
+ <ognl.version>3.1.2</ognl.version>
<asm.version>3.3</asm.version>
<asm5.version>5.0.2</asm5.version>
- <tiles.version>2.0.6</tiles.version>
+ <tiles.version>3.0.5</tiles.version>
+ <tiles-request.version>1.0.6</tiles-request.version>
- <log4j2.version>2.3</log4j2.version>
+ <log4j2.version>2.5</log4j2.version>
<!-- SCM Site Configuration -->
<site.mainDirectory>${project.build.directory}/site</site.mainDirectory>
