You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/05/03 20:18:45 UTC

[51/51] [abbrv] struts git commit: Merge branch 'master' into develop

Merge branch 'master' into develop


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

Branch: refs/heads/develop
Commit: ea098ba08ff0a326f7d30ac9dacc7b48c3ba3151
Parents: 7063f5e 26ab3e4
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun May 3 14:01:21 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun May 3 14:01:21 2015 +0200

----------------------------------------------------------------------
 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 +-
 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                                         | 2 +-
 xwork-core/pom.xml                              | 2 +-
 53 files changed, 55 insertions(+), 55 deletions(-)
----------------------------------------------------------------------