GitHub user lukaszlenart opened a pull request: https://github.com/apache/struts/pull/60
Struts 2.3.x: Tiles plugin upgrade Fixes [WW-4568](https://issues.apache.org/jira/browse/WW-4568) This PR upgrades the Tiles Plugin and adjusts its API to be compatible with Tiles 2.2.2 - this allows introduce support for OGNL, EL, Wildcards and so on. You can merge this pull request into a Git repository by running: $ git pull https://github.com/lukaszlenart/struts tiles-plugin-upgrade-struts-2-3 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/60.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #60 ---- commit 1dc545e34c19520c0ba780b43c53a28f5e3e9484 Author: Lukasz Lenart <lukasz.len...@gmail.com> Date: 2015-11-25T19:22:31Z Adds required dependencies (cherry picked from commit 85b2198) commit 9862580bbee704cff63b917f3dfda62d21c1bad5 Author: Lukasz Lenart <lukasz.len...@gmail.com> Date: 2015-11-25T19:29:18Z Re-implements tiles integration based on new API (cherry picked from commit 70716e9) commit efcea81b67d260835eff9c811efe20a816df7213 Author: Lukasz Lenart <lukasz.len...@gmail.com> Date: 2015-11-25T19:29:24Z Drops unused classes (cherry picked from commit 24a5bce) commit 5d30eb1ad21d369a5e5e844363f3ec1e0e93d03a Author: Lukasz Lenart <lukasz.len...@gmail.com> Date: 2015-11-25T19:29:43Z Replaces call to deprecated api (cherry picked from commit 26f153d) commit ddeb7f0f7cc2600ceb36b8532fc433861a38c20e Author: Lukasz Lenart <lukasz.len...@gmail.com> Date: 2015-11-25T19:37:42Z Updates Portal Tiles integration (cherry picked from commit 6edc0ff) commit 913944b8eee6c5565cb665b5477953be9b85152a Author: Lukasz Lenart <lukasz.len...@gmail.com> Date: 2015-11-25T19:54:39Z Adds missing header with license (cherry picked from commit 27ad6cb) commit f19e4be947c00511a91ea2d806c9c483694f7485 Author: Lukasz Lenart <lukasz.len...@gmail.com> Date: 2015-11-27T12:36:52Z Registers Tiles model (cherry picked from commit 388861f) commit 27aa7e1e27546effcfc1e4214d231b4a31263fb5 Author: Lukasz Lenart <lukasz.len...@gmail.com> Date: 2015-11-28T14:39:47Z Fixes dependency clash (cherry picked from commit 6622fab25bee1dae9085cca56b87711f3197916d) Conflicts: apps/showcase/pom.xml plugins/bean-validation/pom.xml ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org