struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [08/11] struts git commit: Merge branch 'release/2.3.20'
Date Tue, 02 Dec 2014 09:56:34 GMT
Merge branch 'release/2.3.20'


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

Branch: refs/heads/master
Commit: 2886a30917e30e0da223d8d600d2ed0ce6a40d51
Parents: aebdad9 5078537
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Fri Nov 21 21:53:36 2014 +0100
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Fri Nov 21 21:53:36 2014 +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                                                     | 4 ++--
 bundles/admin/pom.xml                                           | 2 +-
 bundles/demo/pom.xml                                            | 2 +-
 bundles/pom.xml                                                 | 2 +-
 core/pom.xml                                                    | 2 +-
 core/src/main/java/org/apache/struts2/util/TokenHelper.java     | 3 ++-
 .../org/apache/struts2/views/freemarker/FreemarkerResult.java   | 5 +----
 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                                            | 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                                                         | 2 +-
 xwork-core/pom.xml                                              | 2 +-
 54 files changed, 57 insertions(+), 59 deletions(-)
----------------------------------------------------------------------



Mime
View raw message